systemathics
diff --git a/‎.github/workflows/build.yml‎
Lines changed: 33 additions & 33 deletions b/‎.github/workflows/build.yml‎
Lines changed: 33 additions & 33 deletions
diff --git a/‎.gitignore‎
Lines changed: 5 additions & 5 deletions b/‎.gitignore‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎README.md‎
Lines changed: 23 additions & 0 deletions b/‎README.md‎
Lines changed: 23 additions & 0 deletions
diff --git a/‎buf.yaml‎
Lines changed: 0 additions & 12 deletions b/‎buf.yaml‎
Lines changed: 0 additions & 12 deletions
diff --git a/‎build.py‎
Lines changed: 11 additions & 173 deletions b/‎build.py‎
Lines changed: 11 additions & 173 deletions
diff --git a/‎pass_out‎
Lines changed: 0 additions & 1 deletion b/‎pass_out‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎python/setup.cfg‎
Lines changed: 0 additions & 2 deletions b/‎python/setup.cfg‎
Lines changed: 0 additions & 2 deletions
diff --git a/‎python/setup.py‎
Lines changed: 0 additions & 23 deletions b/‎python/setup.py‎
Lines changed: 0 additions & 23 deletions
@@ -1,34 +1,34 @@
-name: Upload Python Package
-
-on: 
-  push:
-    tags: v*
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.x'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install setuptools wheel twine grpcio grpcio-tools protobuf
-    - name: Set VERSION environment variable
-      run: |
-        echo GitHub_ref: $GITHUB_REF
-        arrTag=(${GITHUB_REF//\// })
-        VERSION="${arrTag[2]}"
-        echo Version: $VERSION
-        VERSION="${VERSION//v}"
-        echo Clean Version: $VERSION
-        echo "VERSION=${VERSION}" >> $GITHUB_ENV
-    - name: Build and publish
-      env:
-        TWINE_USERNAME: "__token__"
-        TWINE_PASSWORD: ${{ secrets.PYPI_ORG_TOKEN }}
-      run: |
+name: Upload Python Package
+
+on: 
+  push:
+    tags: v*
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.x'
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade build
+        python -m pip install --upgrade twine
+    - name: Set VERSION environment variable
+      run: |
+        echo GitHub_ref: $GITHUB_REF
+        arrTag=(${GITHUB_REF//\// })
+        VERSION="${arrTag[2]}"
+        echo Version: $VERSION
+        VERSION="${VERSION//v}"
+        echo Clean Version: $VERSION
+        echo "VERSION=${VERSION}" >> $GITHUB_ENV
+    - name: Build and publish
+      env:
+        TWINE_USERNAME: "__token__"
+        TWINE_PASSWORD: ${{ secrets.PYPI_ORG_TOKEN }}
+      run: |
         python ./build.py
@@ -1,5 +1,5 @@
-/bin
-/lib
-/pyvenv.cfg
-/python/dist
-/python/systemathics.apis.egg-info
+/bin
+/lib
+/pyvenv.cfg
+/python/dist
+/python/systemathics.apis.egg-info
@@ -0,0 +1,23 @@
+# About Ganymede
+
+Built as cloud native, Ganymede is a fully managed platform, continuously updated with high-quality, curated,
+and cross validated data. Ganymede is purpose built for the financial data markets ever increasing data volumes,
+allowing clients to query against large data sets, including tick-by-tick, sampled, daily, corporate actions,
+ESG and reference data. Packed with a broad range of analytics, the solution is optimized for fast response times,
+supports full order book natively and allows fine grained/customizable trade and quote conditions mapping and filtering.
+
+For further information, please visit [Ganymede home page](https://ganymede.cloud) 
+
+# About this project
+
+This project provides up-to-date gRPC clients to access [Ganymede API](https://ganymede.cloud/api-documentation.html)
+
+Latest Python package
+
+[![PyPI version](https://badge.fury.io/py/systemathics.apis.svg)](https://badge.fury.io/py/systemathics.apis) 
+
+# About us
+
+[Systemathics](https://systemathics.com) is a French fintech founded in 2008 developing its innovative products with the highest quality standards 100% in France.
+Our main mission is to provide global investors with a complete end-to-end solution to systematize alpha generation in a robust way.
+From data pre and post trade analysis, back-testing, risk assessment and signal generation to day-to-day execution in production and everything in between.
@@ -1,13 +1,7 @@
 #!/usr/bin/python
 
 import os
-from pickle import FALSE
 import subprocess
-import shutil
-
-def create_dir_if_needed(dir):
-    if(not(os.path.isdir(dir))):
-        os.makedirs(dir)
 
 def delete_dir_if_needed(top_dir):
     if(os.path.isdir(top_dir)):
@@ -18,112 +12,20 @@ def delete_dir_if_needed(top_dir):
                 os.rmdir(os.path.join(root, dir))
         os.rmdir(top_dir)
 
-def is_grpc_file (path):
-    """Test if a *.proto file describe a grpc service"""
-    for line in open(path, 'r').readlines() :
-        if line.startswith('service ') :
-            return True
-    return False
-
-def create_files_tuples(dir):
-    """Create the lists of files from `dir` and ventilate them in 3 categories :
-    - grpc files (containing a grpc service)
-    - proto files (without a grpc service)
-    - python files
-
-    Returns a tuple with 3 lists. 
-    First list contains grpc files. 
-    Second list contains regular proto files
-    Third list contains python files
-    """
-    grpc_files = []
-    proto_files = []
-    python_files = []
-    print(f"create_files_tuples(dir={dir})")
-    for root, dirs, files in os.walk(dir, topdown=True):
-        # skip google folder
-        if 'google' in dirs:
-            dirs.remove('google')
-        for file in files:
-            path = os.path.join(root, file)
-            if (file.endswith('.proto')) :
-                if(is_grpc_file(path)) :
-                    print(f"grpc:   {path}")
-                    grpc_files.append(path)
-                else:
-                    proto_files.append(path)
-                    print(f"proto:  {path}")
-            if (file.endswith('.py')) :
-                print(f"python: {path}")
-                python_files.append(path)
-
-    return (grpc_files,proto_files,python_files)
-
-def generate_grpc_file(files, scr_dir, target_dir):
-    create_dir_if_needed(target_dir)
-    all_files= " ".join(files)
-    cmd = f"python3 -m grpc_tools.protoc --proto_path={scr_dir} --python_out={target_dir} --grpc_python_out={target_dir} {all_files}"
-    print(cmd)
-    subprocess.call(cmd, cwd=scr_dir, shell=True)
-
-def generate_proto_file(files, scr_dir, target_dir):
-    all_files= " ".join(files)
-    create_dir_if_needed(target_dir)
-    cmd = f"python3 -m grpc_tools.protoc --proto_path={scr_dir} --python_out={target_dir} {all_files}"
-    print(cmd)
-    subprocess.call(cmd, cwd=scr_dir, shell=True)
-
-def copy_python_sources(files, src_dir, target_dir):
-    create_dir_if_needed(target_dir)
-    for file in files:
-        file2 = file.replace(src_dir, target_dir)
-        folder2=os.path.dirname(file2)
-        create_dir_if_needed(folder2)
-        print(f"Copying \n  {file} to \n  {file2}")
-        shutil.copy(file, file2)
-
-def generate(tuple_of_list, src_dir, target_dir):
-    grpc_files = tuple_of_list[0]
-    proto_files = tuple_of_list[1]
-    python_files = tuple_of_list[2]
-
-    copy_python_sources(python_files, src_dir, target_dir)
-    generate_grpc_file(grpc_files, src_dir, target_dir)
-    generate_proto_file(proto_files, src_dir, target_dir)
-    
-def add_namespace_import_to_init_py(dir):
-    for root, _, _ in os.walk(dir, topdown=True):
-        path = os.path.join(root,'__init__.py')
-        with open(path, 'w') as f:
-            f.write("__import__('pkg_resources').declare_namespace(__name__)")
-
-def extract_version(data):
-    version_pattern ='version="'
-    l = len(version_pattern)
-    start = data.find('version="')
-    end = data.find('"', start + l + 1)
-    return data[start + l : end]
-
-def replace_version_in_setup(dir):
+def update_version(dir):
     # Read in the file
-    path = os.path.join(dir,'setup.py')
-    with open(path, 'r') as file :
-        filedata = file.read()
-
-    old_version = extract_version(filedata)
+    path = os.path.join(dir,'__init__.py')
 
-    # Check is done before taht this env variable exists
+    # Check is done before that this env variable exists
     new_version = os.getenv('VERSION', "")
-
-    # Replace the target string
-    filedata = filedata.replace(old_version, new_version)
+    print(f"__version__ = \"{new_version}\"")
 
     # Write the file out again
     with open(path, 'w') as file:
-        file.write(filedata)
+        file.write(f"__version__ = \"{new_version}\"")
 
 def generate_package(root_dir):
-    cmd = "python3 setup.py sdist"
+    cmd = "python3 -m build"
     subprocess.call(cmd, cwd=root_dir, shell=True)
 
 def check_environement():
@@ -145,55 +47,6 @@ def check_environement():
         raise Exception("missing env var TWINE_PASSWORD")
     password = ''
 
-    # # used by publish_package function
-    # key = os.getenv('PYPI_PUBLISH_INDIRECT_KEY','')
-    # if(key == ''):
-    #     raise Exception("missing env var PYPI_PUBLISH_INDIRECT_KEY")
-
-    # # used by publish_package function
-    # user = os.getenv('PYPI_USERNAME','')
-    # if(user == ''):
-    #     raise Exception("missing env var PYPI_USERNAME")
-
-    # # used by publish_package function
-    # repository = os.getenv('PYPI_REPOSITORY','')
-    # if(repository == ''):
-    #     raise Exception("missing env var PYPI_REPOSITORY")
-
-def publish_test_package(root_dir):
-    # pass_out generated with
-    # > echo -n ${{PASSWORD}} > ./pass
-    # > openssl aes-256-cbc -pbkdf2 -e -k "${{PYPI_PUBLISH_INDIRECT_KEY}}" < ./pass > ./pass_out
-
-    # used by publish_package function
-    key = os.getenv('PYPI_PUBLISH_INDIRECT_KEY','')
-    if(key == ''):
-        raise Exception("missing env var PYPI_PUBLISH_INDIRECT_KEY")
-
-    # used by publish_package function
-    user = os.getenv('PYPI_USERNAME','')
-    if(user == ''):
-        raise Exception("missing env var PYPI_USERNAME")
-
-    # used by publish_package function
-    repository = os.getenv('PYPI_REPOSITORY','')
-    if(repository == ''):
-        raise Exception("missing env var PYPI_REPOSITORY")
-
-    # convert password, as strange chars are not always accepted in env var...
-    path = os.path.join(root_dir, "pass")
-    path_out = os.path.join(root_dir, "..", "pass_out")
-    openssl_cmd = f'openssl aes-256-cbc -pbkdf2 -d -k "{key}" < {path_out} > {path}'
-    subprocess.call(openssl_cmd, cwd=root_dir, shell=True)
-
-    with open(path, 'r') as f:
-        password = f.read()
-
-    cmd = f"python3 -m twine upload --repository {repository} dist/* -u {user} -p '{password}'"
-
-    os.remove(path)
-    subprocess.call(cmd, cwd=root_dir, shell=True)
-
 def publish_package(root_dir):
     # used by publish_package function
     cmd = f"python3 -m twine upload dist/*"
@@ -208,36 +61,21 @@ def main():
     # define vars
     root = os.path.dirname(os.path.realpath(__file__))
     src_dir = os.path.join(root, "src")
-    out_dir = os.path.join(root, "python")
-    stx_dir = os.path.join(out_dir, "systemathics")
-    dist_dir = os.path.join(out_dir, "dist")
+    stx_dir = os.path.join(src_dir, "systemathics","apis")
+    dist_dir = os.path.join(src_dir, "dist")
 
     print("Clean old generated code")
-    create_dir_if_needed(out_dir)
-    delete_dir_if_needed(stx_dir)
     delete_dir_if_needed(dist_dir)
 
-    # get proto files (grpc and regular)
-    print("Get files")
-    result = create_files_tuples(src_dir)
-
-    # generate new python file from proto
-    print("Generate")
-    generate(result, src_dir, out_dir)
-
-    # add proto import to __init__.py files
-    print("Add namespace import to __init__.py files")
-    add_namespace_import_to_init_py(stx_dir)
-
     # generate package
     print("Setting version in setup.py")
-    replace_version_in_setup(out_dir)
+    update_version(stx_dir)
     print("Generate package")
-    generate_package(out_dir)
+    generate_package(src_dir)
 
     # publish package
     print("Publish package")
-    publish_package(out_dir)
+    publish_package(src_dir)
 
 if __name__ == "__main__":
     # execute only if run as a script