accli 0.7.3__tar.gz → 0.7.5__tar.gz

{accli-0.7.3 → accli-0.7.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: accli
-Version: 0.7.3
+Version: 0.7.5
 Summary: IIASA Accelerator Client
 Author-email: Wrufesh S <wrufesh@gmail.com>
 License: The MIT License (MIT)
@@ -29,7 +29,7 @@ Project-URL: Bug Tracker, https://github.com/iiasa/accli/issues
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.7.17
+Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 
@@ -91,3 +91,6 @@ Please follow [this link.](https://packaging.python.org/en/latest/tutorials/pack
 2. Run 'python scripts/tag.py'
 3. `python -m build`
 4. `twine upload -r pypi -u __token__ -p <password-or-token> ./dist/*`
+
+
+#TODO nuitka --standalone --onefile --static-libpython=yes --include-package=accli --output-dir=build -m accli.cli:app

{accli-0.7.3 → accli-0.7.5}/README.md

@@ -56,3 +56,6 @@ Please follow [this link.](https://packaging.python.org/en/latest/tutorials/pack
 2. Run 'python scripts/tag.py'
 3. `python -m build`
 4. `twine upload -r pypi -u __token__ -p <password-or-token> ./dist/*`
+
+
+#TODO nuitka --standalone --onefile --static-libpython=yes --include-package=accli --output-dir=build -m accli.cli:app

{accli-0.7.3 → accli-0.7.5}/accli/AcceleratorJobProjectService.py

@@ -121,6 +121,25 @@ class AcceleratorJobProjectService:
         if res.data:
             return todict(res.data)
 
+
+    def get_filename_dataset_type(self, filename):
+        res = self.http_client_request(
+            "GET", 
+            f"{self.cli_base_url}/filename-dataset-type/?filename={filename}",
+            headers=self.common_request_headers
+        )
+        if res.data:
+            return todict(res.data)
+
+    def get_filename_validation_details(self, filename):
+        res = self.http_client_request(
+            "GET", 
+            f"{self.cli_base_url}/filename-validation-detail/?filename={filename}",
+            headers=self.common_request_headers
+        )
+        if res.data:
+            return todict(res.data)
+
     def get_bucket_object_validation_details(self, bucket_object_id):
         res = self.http_client_request(
             "GET", 
@@ -228,7 +247,7 @@ class AcceleratorJobProjectService:
 
     def get_multipart_put_update_signed_url(
         self,
-        bucket_object_id,
+        filename,
         upload_id,
         part_number,
     ):
@@ -236,7 +255,7 @@ class AcceleratorJobProjectService:
             "GET", 
             f"{self.cli_base_url}/put-update-signed-url",
             fields=dict(
-                bucket_object_id=bucket_object_id,
+                filename=filename,
                 upload_id=upload_id,
                 part_number=part_number
             ),
@@ -270,10 +289,11 @@ class AcceleratorJobProjectService:
 
         return data['upload_id'], data['app_bucket_id'], data['uniqified_filename']
 
-    def get_put_update_multipart_upload_id(self, bucket_object_id):
+    def get_put_update_multipart_upload_id(self, filename):
+        encoded_filename = quote(filename)
         res = self.http_client_request(
             "GET", 
-            f"{self.cli_base_url}/update-multipart-upload-id/{bucket_object_id}",
+            f"{self.cli_base_url}/update-multipart-upload-id/?filename={encoded_filename}",
             headers=self.common_request_headers
         )
 
@@ -306,8 +326,34 @@ class AcceleratorJobProjectService:
 
         return todict(res.data)
 
+
+    def complete_validator_multipart_upload(
+        self,
+        app_bucket_id,
+        filename,
+        upload_id,
+        parts: List[Tuple[str, str]]
+    ):
+        headers = {"Content-Type": "application/json"}
+
+        headers.update(self.common_request_headers)
+
+        res = self.http_client_request(
+            "PUT", 
+            f"{self.cli_base_url}/complete-validator-multipart-upload",
+            json=dict(
+                app_bucket_id=app_bucket_id,
+                filename=filename,
+                upload_id=upload_id,
+                parts=base64.b64encode(json.dumps(parts).encode()).decode()
+            ),
+            headers=headers
+        )
+
+        return todict(res.data)
+
     def complete_update_multipart_upload(
-        self, bucket_object_id, upload_id, parts: List[Tuple[str, str]]
+        self, filename, upload_id, parts: List[Tuple[str, str]]
     ):
 
         headers = {"Content-Type": "application/json"}
@@ -318,13 +364,15 @@ class AcceleratorJobProjectService:
             "PUT", 
             f"{self.cli_base_url}/complete-update-multipart-upload",
             json=dict(
-                bucket_object_id=bucket_object_id,
+                filename=filename,
                 upload_id=upload_id,
                 parts=base64.b64encode(json.dumps(parts).encode()).decode()
             ),
             headers=headers
         )
 
+        return todict(res.data)
+
     def abort_create_multipart_upload(self, app_bucket_id, filename, upload_id):
         
         headers = {"Content-Type": "application/json"}
@@ -342,7 +390,7 @@ class AcceleratorJobProjectService:
             headers=headers
         )
 
-    def abort_update_multipart_upload(self, bucket_object_id, upload_id):
+    def abort_update_multipart_upload(self, filename, upload_id):
         
         headers = {
             # "Content-Type": "application/json"
@@ -354,7 +402,7 @@ class AcceleratorJobProjectService:
             "PUT", 
             f"{self.cli_base_url}/abort-update-multipart-upload",
             json=dict(
-                bucket_object_id=bucket_object_id,
+                filename=filename,
                 upload_id=upload_id
             ),
             headers=headers
@@ -512,7 +560,7 @@ class AcceleratorJobProjectService:
                 )
             raise err
 
-    def replace_bucket_object_id_content(self, bucket_object_id, file_stream):
+    def replace_bucket_object_id_content(self, filename, file_stream):
         headers = dict()
         headers["Content-Type"] = "application/octet-stream"
 
@@ -552,12 +600,11 @@ class AcceleratorJobProjectService:
 
                 if not upload_id:
                     upload_id = self.get_put_update_multipart_upload_id(
-                        bucket_object_id, 
-                        # headers=headers
+                        filename
                     )
 
                 put_presigned_url = self.get_multipart_put_update_signed_url(
-                    bucket_object_id, upload_id, part_number
+                    filename, upload_id, part_number
                 )
 
                 part_upload_response = requests.put(
@@ -570,16 +617,18 @@ class AcceleratorJobProjectService:
                 etag = part_upload_response.headers.get("etag").replace('"', "")
                 parts.append((part_number, etag))
 
-            result = self.complete_update_multipart_upload(
-                bucket_object_id,
+            created_bucket_object_id = self.complete_update_multipart_upload(
+                filename,
                 upload_id,
                 parts,
             )
+
+            return created_bucket_object_id
         except Exception as err:
             # Cancel if any error
             if upload_id:
                 self.abort_update_multipart_upload(
-                    bucket_object_id,
+                    filename,
                     upload_id,
                 )
 
@@ -648,8 +697,8 @@ class AcceleratorJobProjectService:
                 etag = part_upload_response.headers.get("etag").replace('"', "")
                 parts.append((part_number, etag))
 
-            created_bucket_object_id = self.complete_job_multipart_upload(
-                app_bucket_id, uniqified_filename, upload_id, parts, is_log_file=is_log_file
+            created_bucket_object_id = self.complete_validator_multipart_upload(
+                app_bucket_id, uniqified_filename, upload_id, parts
             )
             return created_bucket_object_id
 

{accli-0.7.3 → accli-0.7.5}/accli/_version.py

@@ -1,3 +1,3 @@
 # Please strictly put double quote to use this info for git tag 
 # Read developer guide for git tag command with regex
-VERSION = "v0.7.3" 
+VERSION = "v0.7.5" 

{accli-0.7.3 → accli-0.7.5}/accli/cli.py

@@ -47,8 +47,8 @@ def about():
 
 @app.command()
 def login(
-    server: Annotated[str, typer.Option(..., '-c',help="Accelerator server url.")] = "https://accelerator-api.iiasa.ac.at", 
-    webcli: Annotated[str, typer.Option(..., '-s', help="Accelerator web client for authorization.")] = "https://accelerator.iiasa.ac.at"
+    server: Annotated[str, typer.Option(..., '-s',help="Accelerator server url.")] = "https://accelerator-api.iiasa.ac.at", 
+    webcli: Annotated[str, typer.Option(..., '-c', help="Accelerator web client for authorization.")] = "https://accelerator.iiasa.ac.at"
 ):
     print(
         f"[bold cyan]Welcome to Accelerator Terminal Client.[/bold cyan]\n"

{accli-0.7.3 → accli-0.7.5}/accli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: accli
-Version: 0.7.3
+Version: 0.7.5
 Summary: IIASA Accelerator Client
 Author-email: Wrufesh S <wrufesh@gmail.com>
 License: The MIT License (MIT)
@@ -29,7 +29,7 @@ Project-URL: Bug Tracker, https://github.com/iiasa/accli/issues
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.7.17
+Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 
@@ -91,3 +91,6 @@ Please follow [this link.](https://packaging.python.org/en/latest/tutorials/pack
 2. Run 'python scripts/tag.py'
 3. `python -m build`
 4. `twine upload -r pypi -u __token__ -p <password-or-token> ./dist/*`
+
+
+#TODO nuitka --standalone --onefile --static-libpython=yes --include-package=accli --output-dir=build -m accli.cli:app

accli-0.7.5/accli.egg-info/requires.txt

@@ -0,0 +1,7 @@
+urllib3>=1.26.5
+typer[all]>=0.4.0
+tinydb>=4.5.2
+requests>=2.25.1
+jsonschema>=4.5.1
+pydantic>=2.0
+gitpython>=3.1.30

{accli-0.7.3 → accli-0.7.5}/pyproject.toml

@@ -11,8 +11,16 @@ authors = [
 description = "IIASA Accelerator Client"
 readme = "README.md"
 license = {file = "LICENSE"}
-requires-python = ">=3.7.17"
-dependencies = ['urllib3', 'typer[all]', 'tinydb', 'requests', 'jsonschema', 'pydantic', 'gitpython']
+requires-python = ">=3.7"
+dependencies = [
+    "urllib3>=1.26.5",        # 2.0.7 is recent, but 1.26.5+ is widely compatible
+    "typer[all]>=0.4.0",      # 0.4.0+ is stable and has most features
+    "tinydb>=4.5.2",          # 4.5.2 is a solid release, avoid tight pin
+    "requests>=2.25.1",       # Commonly supported baseline
+    "jsonschema>=4.5.1",      # 4.5.1+ is safe across libraries
+    "pydantic>=2.0",          # Major version 2 required if you're using v2 features
+    "gitpython>=3.1.30"       # Minimum stable with good Python 3.7+ support
+]
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: MIT License",
@@ -30,4 +38,4 @@ version = {attr="accli._version.VERSION"}
 "Bug Tracker" = "https://github.com/iiasa/accli/issues"
 
 [project.scripts]
-accli = "accli.cli:app"
+accli = "accli.cli:app"

accli-0.7.3/accli.egg-info/requires.txt

@@ -1,7 +0,0 @@
-urllib3
-typer[all]
-tinydb
-requests
-jsonschema
-pydantic
-gitpython