accli 0.7.4__tar.gz → 0.7.6__tar.gz

{accli-0.7.4 → accli-0.7.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: accli
-Version: 0.7.4
+Version: 0.7.6
 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.4 → accli-0.7.6}/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.4 → accli-0.7.6}/accli/AcceleratorTaskDispatcher.py

@@ -143,6 +143,21 @@ class JobDispatchModel(BaseModel):
     children: List['JobDispatchModel'] = []
     callback: Optional['JobDispatchModel']
 
+    def dict(self, *args, **kwargs):
+        result = super().dict(*args, **kwargs)
+        if result['is_holder_job'] and result['execute_cluster'] == 'WKUBE':
+            if len(result['children']) > 1:
+                if not result['children'][0]['job_kwargs'].get('docker_image'):
+                    builder_task = result['children'][0].copy()
+                    
+                    builder_task['build_only_task'] = True
+
+                    builder_task['callback'] = result.copy()
+                    builder_task['name'] = f"{builder_task['callback']['name']} -- Image Builder"
+                    builder_task['callback']['name'] = f"{builder_task['callback']['name']} -- Holder"
+                    return builder_task
+        return result
+
 
 class WKubeTaskMeta(BaseModel):
     required_cores: float
@@ -234,8 +249,9 @@ class WKubeTask(GenericTask):
         wkube_task_kwargs = None
         wkube_task_meta = dict()
 
-        if (t_args or t_kwargs):
-            name = t_kwargs.pop('name')        
+        
+        name = t_kwargs.pop('name') if 'name' in t_kwargs else None 
+        if (t_args or t_kwargs):        
             WKubeTaskPydantic(*t_args, **t_kwargs)
             wkube_task_kwargs = WKubeTaskKwargs(*t_args, **t_kwargs)
             wkube_task_meta.update(WKubeTaskMeta(*t_args, **t_kwargs).dict(exclude_unset=True))

{accli-0.7.4 → accli-0.7.6}/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.4" 
+VERSION = "v0.7.6" 

{accli-0.7.4 → accli-0.7.6}/accli/cli.py

@@ -212,12 +212,12 @@ def dispatch(
     print(job_to_dispatch.description)
 
 
-    root_job_id = term_cli_project_service.dispatch(
-        project_slug,
-        job_to_dispatch.description
-    )
+    # root_job_id = term_cli_project_service.dispatch(
+    #     project_slug,
+    #     job_to_dispatch.description
+    # )
 
-    print(f"Dispatched root job #ID: {root_job_id}")
+    # print(f"Dispatched root job #ID: {root_job_id}")
 
 
 

{accli-0.7.4 → accli-0.7.6}/accli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: accli
-Version: 0.7.4
+Version: 0.7.6
 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.6/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.4 → accli-0.7.6}/pyproject.toml

@@ -11,15 +11,15 @@ authors = [
 description = "IIASA Accelerator Client"
 readme = "README.md"
 license = {file = "LICENSE"}
-requires-python = ">=3.7.17"
+requires-python = ">=3.7"
 dependencies = [
-    "urllib3~=2.0.7",
-    "typer[all]~=0.16.0",
-    "tinydb~=4.8.0",
-    "requests~=2.31.0",
-    "jsonschema~=4.17.3",
-    "pydantic~=2.5.3",
-    "gitpython~=3.1.43"
+    "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",
@@ -38,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.4/accli.egg-info/requires.txt

@@ -1,7 +0,0 @@
-urllib3~=2.0.7
-typer[all]~=0.16.0
-tinydb~=4.8.0
-requests~=2.31.0
-jsonschema~=4.17.3
-pydantic~=2.5.3
-gitpython~=3.1.43