hcs-core 0.1.282__py3-none-any.whl → 0.1.284__py3-none-any.whl

hcs_core/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.282"
+__version__ = "0.1.284"

hcs_core/ctxp/_init.py

@@ -71,7 +71,7 @@ if _app_name:
 
 def app_name():
     dir_name = path.dirname(state._file._path)
-    name = dir_name[dir_name.rindex("/") + 1 :]
+    name = dir_name[dir_name.rindex(os.sep) + 1 :]
     if name.startswith("."):
         return name[1:]
     raise ValueError("Unable to determine app name: " + dir_name)

hcs_core/ctxp/state.py

@@ -31,7 +31,7 @@ class _StateFile:
             self._cache = jsondot.load(self._path, {}, lock=True)
         return self._cache
 
-    def get(self, key: str, default: Any, reload: bool = False):
+    def get(self, key: str, default: Any = None, reload: bool = False):
         return self._data(reload).get(key, default)
 
     def set(self, key: str, value: Any):
@@ -47,7 +47,7 @@ def init(store_path: str, name: str):
     _file = _StateFile(os.path.join(store_path, name))
 
 
-def get(key: str, default: Any, reload: bool = False):
+def get(key: str, default: Any = None, reload: bool = False):
     return _file.get(key=key, default=default, reload=reload)
 
 

hcs_core/plan/dag.py

@@ -15,6 +15,7 @@ limitations under the License.
 
 import threading
 import time
+import traceback
 from concurrent.futures import ThreadPoolExecutor
 from copy import deepcopy
 from graphlib import TopologicalSorter

hcs_core/sglib/auth.py

@@ -16,6 +16,7 @@ limitations under the License.
 import hashlib
 import json
 import logging
+import threading
 import time
 
 import jwt
@@ -59,24 +60,32 @@ def _decode_http_basic_auth_token(basic_token: str):
         raise CtxpException(f"Invalid basic http auth token: {e}")
 
 
+_login_lock = threading.Lock()
+
+
 def login(force_refresh: bool = False, panic_on_failure: bool = True):
     """Ensure login state, using credentials from the current profile. Return oauth token."""
-    effective_profile = profile.current()
-
-    auth_data = profile.auth.get()
-    if force_refresh or not _is_auth_valid(auth_data, effective_profile):
-        oauth_token = _get_new_oauth_token(auth_data.token, effective_profile)
-        if oauth_token:
-            use_oauth_token(oauth_token, effective_profile)
-        elif panic_on_failure:
-            panic(
-                "Login failed. If this is configured API key or client credential, refresh the credential from CSP and update profile config. If this is browser based interactive login, login again."
-            )
+
+    _login_lock.acquire()
+    try:
+        effective_profile = profile.current()
+
+        auth_data = profile.auth.get()
+        if force_refresh or not _is_auth_valid(auth_data, effective_profile):
+            oauth_token = _get_new_oauth_token(auth_data.token, effective_profile)
+            if oauth_token:
+                use_oauth_token(oauth_token, effective_profile)
+            elif panic_on_failure:
+                panic(
+                    "Login failed. If this is configured API key or client credential, refresh the credential from CSP and update profile config. If this is browser based interactive login, login again."
+                )
+            else:
+                return None
         else:
-            return None
-    else:
-        oauth_token = auth_data.token
-    return oauth_token
+            oauth_token = auth_data.token
+        return oauth_token
+    finally:
+        _login_lock.release()
 
 
 def _get_new_oauth_token(old_oauth_token, effective_profile):
@@ -100,7 +109,7 @@ def _get_new_oauth_token(old_oauth_token, effective_profile):
             old_oauth_token = profile.auth.get().token
         if old_oauth_token:
             try:
-                oauth_token = _refresh_oauth_token(old_oauth_token, csp_config.url)
+                oauth_token = refresh_oauth_token(old_oauth_token, csp_config.url)
             except Exception as e:
                 oauth_token = None
                 log.warning(e)
@@ -113,7 +122,7 @@ def _get_new_oauth_token(old_oauth_token, effective_profile):
     return oauth_token
 
 
-def _refresh_oauth_token(old_oauth_token: dict, csp_url: str):
+def refresh_oauth_token(old_oauth_token: dict, csp_url: str):
     with OAuth2Client(token=old_oauth_token) as client:
         log.debug("Refresh auth token...")
         new_token = client.refresh_token(csp_url + "/csp/gateway/am/api/auth/token")

hcs_core/sglib/client_util.py

@@ -16,6 +16,7 @@ limitations under the License.
 import json
 import os
 import sys
+import threading
 import time
 from typing import Callable, Iterator
 
@@ -27,21 +28,27 @@ from hcs_core.util.query_util import PageRequest, with_query
 
 _caches = {}
 
+_client_instance_lock = threading.RLock()
+
 
 def hdc_service_client(service_name: str) -> EzClient:
-    instance = _caches.get(service_name)
-    if not instance:
-
-        def _get_url():  # make it deferred so no need to initialize profile
-            url = _get_hcs_url_considering_env_override(service_name)
-            if not url.endswith("/"):
-                url += "/"
-            url += service_name
-            return url
-
-        instance = hcs_client(_get_url)
-        _caches[service_name] = instance
-    return instance
+    _client_instance_lock.acquire()
+    try:
+        instance = _caches.get(service_name)
+        if not instance:
+
+            def _get_url():  # make it deferred so no need to initialize profile
+                url = _get_hcs_url_considering_env_override(service_name)
+                if not url.endswith("/"):
+                    url += "/"
+                url += service_name
+                return url
+
+            instance = hcs_client(_get_url)
+            _caches[service_name] = instance
+        return instance
+    finally:
+        _client_instance_lock.release()
 
 
 def _get_hcs_url_considering_env_override(service_name: str):

hcs_core/sglib/ez_client.py

@@ -15,7 +15,9 @@ limitations under the License.
 
 import json
 import logging
+import os
 import sys
+import threading
 from http.client import HTTPResponse
 from typing import Callable, Optional, Type, Union
 
@@ -138,25 +140,30 @@ class EzClient:
         self._base_url = base_url
         self._client_impl = oauth_client
         self._lazy_oauth_client = lazy_oauth_client
+        self._lock = threading.Lock()
 
     def _client(self):
-        if not self._client_impl:
-            client = self._lazy_oauth_client()
-            base_url = self._base_url() if callable(self._base_url) else self._base_url
-            client.base_url = base_url
-            client.timeout = 30
-            request_hooks = client.event_hooks["request"]
-            response_hooks = client.event_hooks["response"]
-            if _log_request not in request_hooks:
-                request_hooks.append(_log_request)
-            if _log_response not in response_hooks:
-                response_hooks.append(_log_response)
-            if _raise_on_4xx_5xx not in response_hooks:
-                response_hooks.append(_raise_on_4xx_5xx)
-            self._client_impl = client
-
-        self._client_impl.ensure_token()
-        return self._client_impl
+        self._lock.acquire()
+        try:
+            if not self._client_impl:
+                client = self._lazy_oauth_client()
+                base_url = self._base_url() if callable(self._base_url) else self._base_url
+                client.base_url = base_url
+                client.timeout = int(os.environ.get("HCS_TIMEOUT", 30))
+                request_hooks = client.event_hooks["request"]
+                response_hooks = client.event_hooks["response"]
+                if _log_request not in request_hooks:
+                    request_hooks.append(_log_request)
+                if _log_response not in response_hooks:
+                    response_hooks.append(_log_response)
+                if _raise_on_4xx_5xx not in response_hooks:
+                    response_hooks.append(_raise_on_4xx_5xx)
+                self._client_impl = client
+
+            self._client_impl.ensure_token()
+            return self._client_impl
+        finally:
+            self._lock.release()
 
     def post(
         self,

{hcs_core-0.1.282.dist-info → hcs_core-0.1.284.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-core
-Version: 0.1.282
+Version: 0.1.284
 Summary: Horizon Cloud Service CLI module.
 Project-URL: Homepage, https://github.com/euc-eng/hcs-cli
 Project-URL: Bug Tracker, https://github.com/euc-eng/hcs-cli/issues
@@ -35,7 +35,7 @@ Requires-Dist: schedule>=1.1.0
 Requires-Dist: setuptools>=70.0.0
 Requires-Dist: tabulate>=0.9.0
 Requires-Dist: websocket-client>=1.2.3
-Requires-Dist: yumako>=0.1.21
+Requires-Dist: yumako>=0.1.24
 Provides-Extra: dev
 Requires-Dist: bandit; extra == 'dev'
 Requires-Dist: black; extra == 'dev'

{hcs_core-0.1.282.dist-info → hcs_core-0.1.284.dist-info}/RECORD

@@ -1,6 +1,6 @@
-hcs_core/__init__.py,sha256=Jfi46RxCoBJZUyEOPruwtx2aH666Z3W505S836AQ7KM,24
+hcs_core/__init__.py,sha256=cu7zK2WAuHTAQTzBhHUgeqW9691ut6R5zcygIfmPeKc,24
 hcs_core/ctxp/__init__.py,sha256=bHVHhJP10Luz1a3Kk3zFx14dAO4SY6Q20Lrv8rNWWGc,1075
-hcs_core/ctxp/_init.py,sha256=7yFCIJLNp6joUahm58EK2X5OeCKNGM5rmmdPDpZ3Z7o,2794
+hcs_core/ctxp/_init.py,sha256=yq46VOty4zs_WcLt1SrtePxbW8S4RIz4YUCP3xIBvCA,2797
 hcs_core/ctxp/cli_options.py,sha256=g5JnzOtyWiGLCLcGp5x54MPFLW_NOfhfevXUlX5L8tM,2532
 hcs_core/ctxp/cli_processor.py,sha256=2RhBz7zFm2UDRwbMDwBpeAQQCt4sjZJzn1nePAcMA_o,7329
 hcs_core/ctxp/cmd_util.py,sha256=_-VwQSmkfi52qWC3uHQI06mSiIPfsZroDruTDYHXiMA,3119
@@ -17,7 +17,7 @@ hcs_core/ctxp/logger.py,sha256=6Sh1WXUrjrQNU7K6zUlBzE34fIS6o6oMU3eqSknUOEo,6321
 hcs_core/ctxp/profile.py,sha256=OElbba1V1hnnn-m9UI7-WjUglYpaJ_FHeHjeqyhm13c,7690
 hcs_core/ctxp/profile_store.py,sha256=v4RvKSaKSJhAt5rEGbC6v-NfaI3N67YffPm-qlrQWdg,1566
 hcs_core/ctxp/recent.py,sha256=Lbv1q6Ld-7FKFaA_FNyqI_WaFDp9zQAOFjFVzox5GoE,1767
-hcs_core/ctxp/state.py,sha256=iXHD_pMfKB2gkK360XfTpJhEcugkH9FlBMO6Rjg4918,1620
+hcs_core/ctxp/state.py,sha256=gjcMRVONKBq7WiFQo-xca1726ngZe90mnPrF3vbXDrU,1634
 hcs_core/ctxp/task_schd.py,sha256=dKNVUGqv1SSXdHufm552FoLr812Grrj3-CNYmSiCfyw,4648
 hcs_core/ctxp/template_util.py,sha256=XslvIuRBlTVsUW0Y9M_D8gUPc1jWq6X2p4At2VAe1KU,731
 hcs_core/ctxp/timeutil.py,sha256=RyRrIRdFHbIghdB8wbC8VdABvc7hki2v51b1x2JvHgo,445
@@ -32,7 +32,7 @@ hcs_core/plan/actions.py,sha256=UvCynzApJUxi39HUoPIQ_uownlbvFbJ4aAs6pmulrLY,125
 hcs_core/plan/base_provider.py,sha256=CSJFN8lopWTUblw8CW78Epnef9BbJVLhPLk9bPfZceM,1299
 hcs_core/plan/context.py,sha256=5NI5Otk0jGKtBGvO8Sc1xdOHUCu_lXQYNrSctT3Hyq8,116
 hcs_core/plan/core.py,sha256=vJDG5WYV6XtYtDjK7lyM6MLrB0OEfH6YDqF06DoC9iw,21137
-hcs_core/plan/dag.py,sha256=hZf8nrbh03xY0zfeoKgAZGnkXXpvWgEJwkpOW3ZLYqM,12953
+hcs_core/plan/dag.py,sha256=TDpyXVuiwAxeWwNq2HkeZq8F90CnT97NfAl1NjYcII4,12970
 hcs_core/plan/helper.py,sha256=__b8tlzLBT1Rm3vgiS-pWnZImaoZbsmKSRJtt_1gj8E,7763
 hcs_core/plan/kop.py,sha256=G1bOPvvaSqrH_AHWWpGx3sFHNvsulbSu6OnPWgBkOqs,5455
 hcs_core/plan/provider/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -41,11 +41,11 @@ hcs_core/plan/provider/dev/_prepare.py,sha256=PvVnheEQwpj8sWYz2lDONQVTs4pHPYuo2c
 hcs_core/plan/provider/dev/dummy.py,sha256=zKEr9J4WHhlN5gFdmrFyEfCF0xlQlCJg0CC1dG9VaLA,1958
 hcs_core/plan/provider/dev/fibonacci.py,sha256=8WhDr5c9harNAlVPZomQJEqbWe0hUqbppO6ZkwEUcJ0,1104
 hcs_core/sglib/__init__.py,sha256=oT0etW7vsEbHlXiGL5x23ZXyyFqeLi81RxQQ5lfKSV0,654
-hcs_core/sglib/auth.py,sha256=4NeCVHTzTvTG6JuQqjEr9fsPG_XxMD3tcBvZ5XVRm6s,6048
+hcs_core/sglib/auth.py,sha256=4nYqW4Hl1mOytQRR0uR7MmT_9BOUQW8RwjyPCZcNIQA,6235
 hcs_core/sglib/cli_options.py,sha256=NvdiHpX_o6IYPEM8cQYLb_R7T4aiXVvYLqn6Vk4Q2-Y,1761
-hcs_core/sglib/client_util.py,sha256=77oqjWjy8DB6mKawIyUu7HaHQsQXZRYQB4_v_I7LbZ4,10674
+hcs_core/sglib/client_util.py,sha256=ZCXmNfmUL4_iry4yU2bPWL0dLLNIGu3zp541cFt6Or0,10876
 hcs_core/sglib/csp.py,sha256=anZqbQLIZw831PgW9Z4pweqfAeBH7rXPIAkwkyPkfGY,8054
-hcs_core/sglib/ez_client.py,sha256=ofrwvJPvOMcdsYPrvRaLcGIfEL8s-inKKT1M_gALQAQ,7335
+hcs_core/sglib/ez_client.py,sha256=6R_gnRRxxmJYg6oJTnUB7ZLvUTRlEEYuhRyLLOvMxWI,7592
 hcs_core/sglib/hcs_client.py,sha256=pxRZQ79ABhOyihAI8oOeTxw2dXkce5-NyRkJAoo0OL0,888
 hcs_core/sglib/init.py,sha256=w_0ZU70Q1TGbSZsqSi7ewKQqpExFlepOT7mIqH0wnho,310
 hcs_core/sglib/login_support.py,sha256=9YLhaocomqMLkoXcVW5-iDfS7QW9ON2Btx4OBZMAhaE,7581
@@ -63,6 +63,6 @@ hcs_core/util/query_util.py,sha256=5bh3bUVIQuY9qerndfuyfyzkTExYJ8zD0_e3PSN7y-4,3
 hcs_core/util/scheduler.py,sha256=bPpCmGUL1UctJMfLPAg-h4Hl2YZr96FiI78-G_Usn08,2958
 hcs_core/util/ssl_util.py,sha256=MvU102fGwWWh9hhSmLnn1qQIWuD6TjZnN0iH0MXUtW0,1239
 hcs_core/util/versions.py,sha256=wwbcYFpxBohI-QjcrmxGsNghdnx4EWHBipMUL7vnpwM,1728
-hcs_core-0.1.282.dist-info/METADATA,sha256=skrCQy0zO94e9GsawF3UxXpAaPKjbiw5jCgPhg8VRlg,1837
-hcs_core-0.1.282.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hcs_core-0.1.282.dist-info/RECORD,,
+hcs_core-0.1.284.dist-info/METADATA,sha256=CKc4laYZVBkqAVZe4dzprWdYERP-orhakeyfj4B2_DU,1837
+hcs_core-0.1.284.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hcs_core-0.1.284.dist-info/RECORD,,