hcs-cli 0.1.331__tar.gz → 0.1.332__tar.gz

{hcs_cli-0.1.331 → hcs_cli-0.1.332}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-cli
-Version: 0.1.331
+Version: 0.1.332
 Summary: Horizon Cloud Service CLI.
 Project-URL: Homepage, https://github.com/euc-eng/hcs-cli
 Project-URL: Bug Tracker, https://github.com/euc-eng/hcs-cli/issues
@@ -14,7 +14,7 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.9
-Requires-Dist: hcs-core>=0.1.331
+Requires-Dist: hcs-core>=0.1.332
 Requires-Dist: inquirerpy>=0.3.4
 Requires-Dist: matplotlib>=3.8.0
 Requires-Dist: paho-mqtt>=2.1.0

{hcs_cli-0.1.331 → hcs_cli-0.1.332}/hcs_cli/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.1.331"
+__version__ = "0.1.332"
 
 from . import service as service  # noqa: F401

{hcs_cli-0.1.331 → hcs_cli-0.1.332}/hcs_cli/cmds/task.py

@@ -495,12 +495,15 @@ def list_tasks(
 @cli.org_id
 @click.option("--namespace", "-n", type=str, required=False)
 @click.option("--group", "-g", type=str, required=False)
+@click.option(
+    "--location", hidden=True, type=str, required=False, help="Task location, only for global scheduler. E.g. US, JP, IN, AU, DE, IE."
+)  # to be removed later
 @click.argument("smart_path", type=str, required=False)
-def get(org: str, namespace: str, group: str, smart_path: str, **kwargs):
+def get(org: str, namespace: str, group: str, location: str, smart_path: str, **kwargs):
     """Get a task. E.g. 'task get [[<namespace>/]<group>/]<key>'."""
     namespace, group, key = _parse_task_param(namespace, group, smart_path)
     org_id = cli.get_org_id(org)
-    return task.get(org_id, namespace, group, key, **kwargs)
+    return task.get(org_id, namespace, group, key, location=location, **kwargs)
 
 
 @task_cmd_group.command()
@@ -551,7 +554,9 @@ def get_logs(org: str, namespace: str, group: str, smart_path: str, last: bool,
     if state and last:
         return "--state cannot be used with --last.", 1
 
-    if org == "all" or org is None:
+    if last and org is None:
+        org_id = cli.get_org_id(org)
+    elif org == "all" or org is None:
         org_id = None
     else:
         org_id = cli.get_org_id(org)
@@ -568,7 +573,7 @@ def get_logs(org: str, namespace: str, group: str, smart_path: str, last: bool,
             search = state_search
 
     if last:
-        t = task.last(org_id, namespace, group, key, **kwargs)
+        t = task.last(org_id, namespace, group, key)
         if t:
             return t.log
         else:

{hcs_cli-0.1.331 → hcs_cli-0.1.332}/hcs_cli/service/task.py

@@ -312,7 +312,7 @@ def _get_v1(namespace: str, group: str, key: str) -> Optional[TaskModel]:
     return t
 
 
-def _get_v2(org_id: str, namespace: str, group: str, key: str) -> Optional[TaskModel]:
+def _get_v2(org_id: str, namespace: str, group: str, key: str, location: str = None) -> Optional[TaskModel]:
     url = f"/v1/tasks/{key}?"
     if org_id:
         url += f"&orgId={org_id}"
@@ -320,6 +320,8 @@ def _get_v2(org_id: str, namespace: str, group: str, key: str) -> Optional[TaskM
         url += f"&namespace={namespace}"
     if group:
         url += f"&group={group}"
+    if location:
+        url += f"&location={location}"
     t = _scm_client.get(url, type=TaskModel)
     if not t:
         return
@@ -333,14 +335,14 @@ def get(org_id: str, namespace: str, group: str, key: str, **kwargs) -> Optional
         t = _get_v1(namespace, group, key)
         t.log = _lastlog(org_id, namespace, group, key)
     elif version == "v2":
-        t = _get_v2(org_id, namespace, group, key)
+        t = _get_v2(org_id, namespace, group, key, location=kwargs.get("location"))
     else:
         t = _get_v1(namespace, group, key)
         if t:
             t.log = _lastlog(org_id, namespace, group, key)
             _task_temp_lru[_k] = "v1"
         else:
-            t = _get_v2(org_id, namespace, group, key)
+            t = _get_v2(org_id, namespace, group, key, location=kwargs.get("location"))
             if t:
                 _task_temp_lru[_k] = "v2"
 

{hcs_cli-0.1.331 → hcs_cli-0.1.332}/pyproject.toml

@@ -21,7 +21,7 @@ keywords = [
 ]
 dynamic = ["version"]
 dependencies = [
-    "hcs-core>=0.1.331",
+    "hcs-core>=0.1.332",
     "reportlab>=4.0.0",
     "matplotlib>=3.8.0",
     "InquirerPy>=0.3.4",