hcs-cli 0.1.331__py3-none-any.whl → 0.1.332__py3-none-any.whl

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/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/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.dist-info → hcs_cli-0.1.332.dist-info}/METADATA

@@ -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.dist-info → hcs_cli-0.1.332.dist-info}/RECORD

@@ -1,4 +1,4 @@
-hcs_cli/__init__.py,sha256=W4Qc1KCSM6Ls-5-EZ-6U4PGhwKirQYirjp25NNYqdR0,72
+hcs_cli/__init__.py,sha256=nPvtkDDB3R6Uz-e6LUQVWGRnxx8UYe4qTvGgMXtbZow,72
 hcs_cli/__main__.py,sha256=mReIxxxuvlcxzSdPfIgptZ_Qkrg0MPOgT37utukr65g,125
 hcs_cli/main.py,sha256=CzGoya6yabf5akJ3l0gEzxBmMKznIhxGRXbsngtuPWc,3014
 hcs_cli/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -7,7 +7,7 @@ hcs_cli/cmds/inspect.py,sha256=QBhBOkf2mHlGhgAhY9FXCfvViL2p4D3BudoKjyADdfE,659
 hcs_cli/cmds/login.py,sha256=0j2VA4cy2pgy6-Rm3ys9JMKHbyrdvCS8tw3LdijM9gk,10606
 hcs_cli/cmds/logout.py,sha256=FDYXnie1jytnEsFj-XuVSU4sZL9VPzaLO1KHFProX4g,185
 hcs_cli/cmds/query.py,sha256=hh1TVeSkvRiB07fqIA3GGpEBtP3XMz5XCmAGTXD7FOM,9302
-hcs_cli/cmds/task.py,sha256=pHyJNn6YXIW0l1KQBwwWma-YH2b455AXEuCi5h7VsZw,28770
+hcs_cli/cmds/task.py,sha256=N9EYRGoTtCVF2yktD0bmSlugGykRaysdwjNoT2al9jY,29037
 hcs_cli/cmds/test.py,sha256=rBFbcpUtwxxm6thl7uZGqmZTyCyFRpMO-xa7wExEhuM,755
 hcs_cli/cmds/upgrade.py,sha256=p1QKlacY5kPIQecN6sFRDXgS-_HrsGu_0Hjb1DXbjgI,377
 hcs_cli/cmds/ad/__init__.py,sha256=oB4WrRdC96cMS2OXs-1ITr8U_3ylI3QQNKZk51KsMJI,82
@@ -398,7 +398,7 @@ hcs_cli/service/edge.py,sha256=YN5uWrXKARfuOnqCKZQYCVP2BrNiAEDdS2AIIAgQdEo,3714
 hcs_cli/service/graphql.py,sha256=Vqt4wMeRSPV_2YhGvb9vs0vlac0_fMAhg1BijKX6reg,468
 hcs_cli/service/pool.py,sha256=aWdW0bRGlE58z95HvdSs7i8kwM79_dzqsrGjtnLv7lA,712
 hcs_cli/service/site.py,sha256=CMKMAhKaXZ67tFGkg5bPPBHsD3Ud76mOZKh4Vw_nx5g,1014
-hcs_cli/service/task.py,sha256=M1P0zwEHSmgg0VH_lxbXwWwUkiZgjBmQLlEjNQMS8Xk,16768
+hcs_cli/service/task.py,sha256=uyewZ4FctrAcdEUbt_mxhcS4iCf3mXz_QAuqdAl8kCE,16912
 hcs_cli/service/template.py,sha256=qKJ09Toe5NmApgd2H0TcVIoFshz-8fh2j3hDtvMO7z4,2242
 hcs_cli/service/uag.py,sha256=HabShUiLzZN-VM_UlPbfb4cQiWcgvsn3eB4CVPOzee0,3193
 hcs_cli/service/vm.py,sha256=Aw1AKvFSPlNTh1VWCdQXf21Yu_tDDao2NhMj5muGzwc,4839
@@ -497,7 +497,7 @@ hcs_cli/support/vm_table.py,sha256=hqNUKLVUuBiuDwlqcAQ7uAT1-4z6ZYOIGRcFWn8lnAo,2
 hcs_cli/support/scm/html_util.py,sha256=clgMpM90HxRRs3D9ORYYNB57AYh7y_-UzJrB4KX3dsY,458
 hcs_cli/support/scm/plan-editor.html.template,sha256=HtXMmvIvTixVEYN1gblCeqFTt_F8JF6ltDC11Eb_GMw,46975
 hcs_cli/support/scm/plan_editor.py,sha256=TxfHyyozoQ_DCyaPrYXFG9n8AnBuUD8753009FUD0GU,8722
-hcs_cli-0.1.331.dist-info/METADATA,sha256=US_xIg46rTOm0XF2UyQlgOebnWS-O8xSV0ObwOt3rtA,3222
-hcs_cli-0.1.331.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-hcs_cli-0.1.331.dist-info/entry_points.txt,sha256=5uH-af1WUETSBSer2bu4YMGQNY5RriJHsjepb8ACiX8,42
-hcs_cli-0.1.331.dist-info/RECORD,,
+hcs_cli-0.1.332.dist-info/METADATA,sha256=HQSDAbv69tNoL5kWve6ZIWmoABWWaPiWx7Yd8zzEfw0,3222
+hcs_cli-0.1.332.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+hcs_cli-0.1.332.dist-info/entry_points.txt,sha256=5uH-af1WUETSBSer2bu4YMGQNY5RriJHsjepb8ACiX8,42
+hcs_cli-0.1.332.dist-info/RECORD,,