ga-api-client 0.3.6__tar.gz → 0.4.0__tar.gz

{ga_api_client-0.3.6/ga_api_client.egg-info → ga_api_client-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ga-api-client
-Version: 0.3.6
+Version: 0.4.0
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent

{ga_api_client-0.3.6 → ga_api_client-0.4.0}/ga_api/ga_api_client.py

@@ -84,9 +84,11 @@ class UnexpectedStatus(Exception):
         super().__init__(self.message)
 
 ACCESS_TOKEN_TIMEOUT = 86400 / 2
-
+SUPPORT_STRATEGIES = ['custom', 'local', 'remote', 'controller']
 class Client:
-    def __init__(self, url, user, tenant, password, ssl=True, burst=1, retry=0, conn_timeout=30, read_timeout=300):
+    def __init__(self, url, user, tenant, password, ssl=True, burst=1, retry=0, conn_timeout=30, read_timeout=300, strategy="custom", controller=None):
+        self.strategy = strategy
+        self.controller = controller
         self.url = url # base url
         self.user = user # user name
         self.tenant = tenant # tenant name
@@ -97,14 +99,20 @@ class Client:
         self._headers = {
             'Content-Type': 'application/json'
         }
+        if self.strategy not in SUPPORT_STRATEGIES:
+            raise Exception(f"unsupported strategy {self.strategy}, supported strategies are {SUPPORT_STRATEGIES}")
+        if self.strategy == 'controller' and self.controller is None:
+            raise Exception(f"controller strategy requires \"controller\" argument")
+        
         self._last_auth = 0 # timestamp of last authenticate in seconds since Eopch
         self._session = aiohttp.ClientSession(trust_env=True)
         # self._session = aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(force_close=True))
         self.timeout = aiohttp.ClientTimeout(total=None, connect=None, sock_connect=conn_timeout, sock_read=read_timeout)
 
+
     async def _authenticate(self):
         authData = {
-            'strategy': 'custom', # tells this is API request
+            'strategy': 'custom',
             'account': f'{self.user}@{self.tenant}', # user account '<user>@<tenant>'
             'password': self.password # user password
         }
@@ -143,6 +151,19 @@ class Client:
                     'answer': answer_s
                 }
         # do authenticate
+        if 'allowLogin' in bringup:
+            if (self.strategy == 'custom' or self.strategy == 'local') and bringup['allowLogin']['local'] is False:
+                raise Exception('local login is not allowed')
+            elif self.strategy == 'remote' and bringup['allowLogin']['remote'] is False:
+                raise Exception('remote login is not allowed')
+            elif self.strategy == 'controller':
+                if bringup['allowLogin']['controller'] is False:
+                    raise Exception('controller login is not allowed')
+                elif len([x for x in bringup['allowLogin']['controller'] if x['_id'] == self.controller]) == 0:
+                    raise Exception(f'controller is not found, available controllers are:{bringup["allowLogin"]["controller"]}')
+                authData['controller'] = self.controller
+            authData['strategy'] = self.strategy
+            
         url = self.url+'/authentication'
         async with self._session.post(url, json=authData, headers=self._headers, ssl=self.ssl) as resp:
             if resp.status != 201:
@@ -217,7 +238,7 @@ class Client:
                     raise e
 
 class System(Client):
-    def __init__(self, url, user=None, password=None, ssl=True, retry=0, conn_timeout=30, read_timeout=300):
+    def __init__(self, url, user=None, password=None, ssl=True, retry=0, conn_timeout=30, read_timeout=300, strategy="custom", controller=None):
         """Construct object to send system requests.
 
         Args:
@@ -231,7 +252,7 @@ class System(Client):
             user = input('User:')
         if password is None:
             password = getpass.getpass('Password:')
-        super().__init__(url, user, 'system', password, ssl=ssl, retry=retry, conn_timeout=conn_timeout, read_timeout=read_timeout)
+        super().__init__(url, user, 'system', password, ssl=ssl, retry=retry, conn_timeout=conn_timeout, read_timeout=read_timeout, strategy=strategy, controller=controller)
 
     async def close(self):
         """Close the underlying connections gracefully. If the event loop is stopped before
@@ -366,14 +387,14 @@ def desc_dataframe(desc_list):
     return pd.DataFrame.from_dict(desc_dict, orient='index')
 
 class Tenant(Client):
-    def __init__(self, url, user=None, tenant=None, password=None, ssl=True, burst=1, retry=0, conn_timeout=30, read_timeout=300):
+    def __init__(self, url, user=None, tenant=None, password=None, ssl=True, burst=1, retry=0, conn_timeout=30, read_timeout=300, strategy="custom", controller=None):
         if user is None:
             user = input('User:')
         if tenant is None:
             tenant = input('Tenant:')
         if password is None:
             password = getpass.getpass('Password:')
-        super().__init__(url, user, tenant, password, ssl=ssl, burst=burst, retry=retry, conn_timeout=conn_timeout, read_timeout=read_timeout)
+        super().__init__(url, user, tenant, password, ssl=ssl, burst=burst, retry=retry, conn_timeout=conn_timeout, read_timeout=read_timeout, strategy=strategy, controller=controller)
 
     async def close(self):
         """Close the underlying connections gracefully. If the event loop is stopped before
@@ -1081,7 +1102,7 @@ class Controller:
         rlt = await self._tenant.get_mgr_config(req)
         return self.desc_resource_group(rlt)
 class Repository:
-    def __init__(self, url, user=None, tenant=None, password=None, ssl=True, burst=1, retry=0, conn_timeout=30, read_timeout=300):
+    def __init__(self, url, user=None, tenant=None, password=None, ssl=True, burst=1, retry=0, conn_timeout=30, read_timeout=300, strategy=None, controller=None):
         """Construct repository object to send tenant requests to API server
 
         Args:
@@ -1093,7 +1114,7 @@ class Repository:
             burst: Maximum concurrent requests to the API server.
             retry: Number of retry at fail of sending request.
         """
-        self._tenant = Tenant(url, user, tenant, password, ssl=ssl, burst=burst, retry=retry, conn_timeout=conn_timeout, read_timeout=read_timeout)
+        self._tenant = Tenant(url, user, tenant, password, ssl=ssl, burst=burst, retry=retry, conn_timeout=conn_timeout, read_timeout=read_timeout, strategy=strategy, controller=controller)
 
     async def close(self):
         """Close the underlying connections gracefully. If the event loop is stopped before

{ga_api_client-0.3.6 → ga_api_client-0.4.0/ga_api_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ga-api-client
-Version: 0.3.6
+Version: 0.4.0
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent

{ga_api_client-0.3.6 → ga_api_client-0.4.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = ga-api-client
-version = 0.3.6
+version = 0.4.0
 long_description = file: README.md
 long_description_content_type = text/markdown
 classifiers =