seqslab-cli 3.3.7__tar.gz → 3.3.8__tar.gz

{seqslab-cli-3.3.7/python/seqslab_cli.egg-info → seqslab-cli-3.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seqslab-cli
-Version: 3.3.7
+Version: 3.3.8
 Summary: Atgenomix SeqsLab Command Line Tool
 Home-page: https://github.com/AnomeGAP/seqslab-cli
 Author: Allen Chang

{seqslab-cli-3.3.7 → seqslab-cli-3.3.8}/python/seqslab/__init__.py

@@ -21,6 +21,6 @@ name = "seqslab"
 __all__ = []
 
 
-__version__ = "3.3.7"
+__version__ = "3.3.8"
 
 LOGGING = {"DIR_PATH": "/var/log/seqslab"}

{seqslab-cli-3.3.7 → seqslab-cli-3.3.8}/python/seqslab/auth/commands.py

@@ -19,6 +19,7 @@ from requests import HTTPError, request
 from seqslab import settings as api_settings
 from seqslab.auth import __version__, aad_app, azuread
 from seqslab.auth.azuread import API_HOSTNAME
+from seqslab.auth.utils import get_org, request_wrap
 from termcolor import cprint
 
 """
@@ -44,12 +45,10 @@ class BaseAuth:
     AUTHORIZATION_URL = f"https://{API_HOSTNAME}/auth/{__version__}/signin/{{backend}}/"
     ACCESS_TOKEN_URL = f"https://{API_HOSTNAME}/auth/{__version__}/token/{{backend}}/"
     REFRESH_TOKEN_URL = f"https://{API_HOSTNAME}/auth/{__version__}/token/refresh/"
-
-    @staticmethod
-    def _request(url, method, *args, **kwargs):
-        response = request(method, url, **kwargs)
-        response.raise_for_status()
-        return response
+    PROFILE_URL = f"https://{API_HOSTNAME}/auth/{__version__}/profile/"
+    ORGANIZATION_GET_URL = (
+        f"https://{API_HOSTNAME}/management/{__version__}/organizations/{{cus_id}}/"
+    )
 
     def _signin_azure_silent(
         self,
@@ -76,7 +75,7 @@ class BaseAuth:
             )
 
         result.update({"assertion": assertion, "scope": " ".join(scopes)})
-        return self._request(
+        return request_wrap(
             self.ACCESS_TOKEN_URL.format(backend=backend),
             method=self.ACCESS_TOKEN_METHOD,
             params={"secure": True},
@@ -89,7 +88,12 @@ class BaseAuth:
         ).json()
 
     def _signin_azure(
-        self, device_code: bool, daemon: bool, backend: str, proxy: str = None
+        self,
+        device_code: bool,
+        daemon: bool,
+        backend: str,
+        organization_id: str,
+        proxy: str = None,
     ) -> dict:
         result = None
         token_uri = self.ACCESS_TOKEN_URL.format(backend=backend)
@@ -121,7 +125,7 @@ class BaseAuth:
             if not device_code:
                 # obtain authorization uri
                 auth_uri = (
-                    self._request(
+                    request_wrap(
                         self.AUTHORIZATION_URL.format(backend=backend),
                         method=self.ACCESS_TOKEN_METHOD,
                         headers={
@@ -176,8 +180,10 @@ class BaseAuth:
                     raise PermissionError(
                         "{}: {}".format(result["error"], result["error_description"])
                     )
+                if organization_id:
+                    result.update({"cus_id": organization_id})
 
-        return self._request(
+        return request_wrap(
             token_uri,
             method=self.ACCESS_TOKEN_METHOD,
             params={"secure": True} if daemon else None,
@@ -230,7 +236,7 @@ class BaseAuth:
         if arrow.utcnow() >= arrow.get(Auth.tokens["attrs"]["exp"]):
             # expired, refresh token
             proxy = context.get_context().args.proxy
-            with Auth._request(
+            with request_wrap(
                 Auth.REFRESH_TOKEN_URL,
                 method=Auth.ACCESS_TOKEN_METHOD,
                 json={"refresh": Auth.tokens["tokens"]["refresh"]},
@@ -270,13 +276,27 @@ class BaseAuth:
         "daemon",
         type=bool,
         positional=False,
-        description="Sign in for a long-running, non-interactive daemon process (optional).",
+        description="Sign in for a long-running, non-interactive daemon process. (optional).",
         aliases=["d"],
     )
-    def signin(self, device_code: bool = False, daemon: bool = False) -> int:
+    @argument(
+        "organization_id",
+        type=str,
+        positional=False,
+        description="The organization id to signin to (optional).  This argument is valid only for device_code flow.",
+        aliases=["o"],
+    )
+    def signin(
+        self, device_code: bool = False, daemon: bool = False, organization_id=None
+    ) -> int:
         """
         Sign in to the configured authentication backend and obtain API access token.
         """
+        if organization_id and not device_code:
+            logging.warning("Organization_id is only valid for device code flow")
+            cprint("Organization_id is valid only for device cod flow.", "red")
+            return errno.EINVAL
+
         ctx = context.get_context()
         backend = ctx.args.backend
         proxy = ctx.args.proxy
@@ -289,9 +309,10 @@ class BaseAuth:
 
         try:
             method = getattr(self, mname)
-            result = method(device_code, daemon, backend, proxy)
+            result = method(device_code, daemon, backend, organization_id, proxy)
             # store in keyring secret service
             user = getpass.getuser()
+
             keyring.set_password(
                 "net.seqslab.api.tokens.refresh", user, result["tokens"]["refresh"]
             )
@@ -313,7 +334,8 @@ class BaseAuth:
     @command(
         aliases=["daemon"],
         help="Authenticate silently to the platform and obtain API access token. "
-        "This requires that the SeqsLab API app admin consent has been granted.",
+        "This requires that the SeqsLab API app admin consent has been granted and also the user must "
+        "daemon-signin beforehand.",
     )
     @argument(
         "scope",
@@ -362,6 +384,15 @@ class BaseAuth:
             keyring.set_password(
                 "net.seqslab.api.tokens.access", user, result["tokens"]["access"]
             )
+            org_info = get_org(
+                access_token=result["tokens"]["access"],
+                cus_id=self._decode(result["tokens"]["access"])["cus_id"],
+                proxy=proxy,
+            )
+            cprint(
+                f"Daemon process signin to {org_info['name']}",
+                "yellow",
+            )
             return 0
         except ValueError:
             return errno.EINVAL
@@ -381,11 +412,19 @@ class BaseAuth:
         """
         Print platform access token.
         """
+        ctx = context.get_context()
+        proxy = ctx.args.proxy
         token = self.get_token()
         if not token:
             cprint("Not signed in yet")
             return errno.EPERM
 
+        org_info = get_org(
+            access_token=token["tokens"]["access"],
+            cus_id=self._decode(token["tokens"]["access"])["cus_id"],
+            proxy=proxy,
+        )
+        cprint(f"For Organization: {org_info['name']} ({org_info['cus_id']})", "yellow")
         cprint(token["tokens"]["access"], "yellow")
         return 0
 

seqslab-cli-3.3.8/python/seqslab/auth/utils.py

@@ -0,0 +1,46 @@
+# Standard Library
+from functools import lru_cache
+
+from requests import request
+from seqslab.auth import __version__, aad_app, azuread
+from seqslab.auth.azuread import API_HOSTNAME
+
+"""
+Copyright (C) 2024, Atgenomix Incorporated.
+
+All Rights Reserved.
+
+This program is an unpublished copyrighted work which is proprietary to
+Atgenomix Incorporated and contains confidential information that is not to
+be reproduced or disclosed to any other person or entity without prior
+written consent from Atgenomix, Inc. in each and every instance.
+
+Unauthorized reproduction of this program as well as unauthorized
+preparation of derivative works based upon the program or distribution of
+copies by sale, rental, lease or lending are violations of federal copyright
+laws and state trade secret laws, punishable by civil and criminal penalties.
+"""
+
+ORGANIZATION_GET_URL = (
+    f"https://{API_HOSTNAME}/management/{__version__}/organizations/{{cus_id}}/"
+)
+
+
+def request_wrap(url, method, *args, **kwargs):
+    response = request(method, url, **kwargs)
+    response.raise_for_status()
+    return response
+
+
+@lru_cache(maxsize=16)
+def get_org(access_token, cus_id, proxy):
+    return request_wrap(
+        ORGANIZATION_GET_URL.format(cus_id=cus_id),
+        method="GET",
+        headers={
+            "Content-Type": "application/x-www-form-urlencoded",
+            "Accept": "application/json",
+            "Authorization": f"Bearer {access_token}",
+        },
+        proxies=proxy,
+    ).json()

seqslab-cli-3.3.8/python/seqslab/organization/commands.py

@@ -0,0 +1,117 @@
+#!/usr/bin/env python3
+# Standard Library
+import errno
+import getpass
+from typing import List
+
+import keyring
+import requests
+import yarl
+from nubia import argument, command, context
+from requests import HTTPError
+from seqslab.auth.commands import BaseAuth as Auth
+from seqslab.auth.utils import get_org
+from seqslab.organization.resource.base import BaseResource
+from termcolor import cprint
+
+"""
+Copyright (C) 2023, Atgenomix Incorporated.
+
+All Rights Reserved.
+
+This program is an unpublished copyrighted work which is proprietary to
+Atgenomix Incorporated and contains confidential information that is not to
+be reproduced or disclosed to any other person or entity without prior
+written consent from Atgenomix, Inc. in each and every instance.
+
+Unauthorized reproduction of this program as well as unauthorized
+preparation of derivative works based upon the program or distribution of
+copies by sale, rental, lease or lending are violations of federal copyright
+laws and state trade secret laws, punishable by civil and criminal penalties.
+"""
+
+
+class BaseOrg:
+    @command
+    def list(self, **kwargs) -> int:
+        """
+        List organizations to which the current user belongs
+        """
+        ctx = context.get_context()
+        backend = ctx.args.backend
+
+        try:
+            token = Auth.get_token().get("tokens").get("access")
+            organizations = (
+                BaseResource.request_wrapper(
+                    callback=requests.get,
+                    url=Auth.PROFILE_URL.format(backend=backend),
+                    headers={"Authorization": f"Bearer {token}"},
+                    status=[requests.codes.ok],
+                )
+                .json()
+                .get("organizations")
+            )
+            for index, org_id in enumerate(organizations):
+                values = organizations[org_id]
+                cprint(
+                    f"{values['name']} ({org_id})",
+                    "yellow",
+                )
+        except HTTPError as e:
+            cprint(str(e), "red")
+            return errno.EPROTO
+        else:
+            return 0
+
+    @command
+    @argument(
+        "id",
+        type=str,
+        positional=False,
+        description="Specify an organization ID (required).",
+    )
+    def switch(self, id, **kwargs) -> int:
+        """
+        Switch organizations
+        """
+        ctx = context.get_context()
+        backend = ctx.args.backend
+        proxy = ctx.args.proxy
+        user = getpass.getuser()
+
+        try:
+            token = Auth.get_token().get("tokens").get("access")
+            resp = BaseResource.request_wrapper(
+                callback=requests.get,
+                url=f"{Auth.AUTHORIZATION_URL.format(backend=backend)}{id}/",
+                headers={"Authorization": f"Bearer {token}"},
+                status=[requests.codes.ok],
+            ).json()
+
+            keyring.set_password(
+                "net.seqslab.api.tokens.refresh", user, resp["tokens"]["refresh"]
+            )
+            keyring.set_password(
+                "net.seqslab.api.tokens.access", user, resp["tokens"]["access"]
+            )
+            org_info = get_org(
+                access_token=token, cus_id=Auth._decode(token)["cus_id"], proxy=proxy
+            )
+            cprint(
+                f"The organization you are currently signed into: {org_info['name']}.",
+                "yellow",
+            )
+        except HTTPError as e:
+            cprint(str(e), "red")
+            return errno.EPROTO
+        else:
+            return 0
+
+
+@command
+class Org(BaseOrg):
+    """Organization commands"""
+
+    def __init__(self):
+        super().__init__()

{seqslab-cli-3.3.7 → seqslab-cli-3.3.8}/python/seqslab/user/commands.py

@@ -149,12 +149,11 @@ class BaseUser:
         if email.find("@") == -1:
             cprint("Please give a legitimate email", "red")
             return errno.ENOENT
-
         ret = backend.add_user(
             email=email,
             roles=roles,
             active=not deactivate,
-            name=name if not name else email.split("@")[0],
+            name=name if name else email.split("@")[0],
         )
         if isinstance(ret, int):
             return ret
@@ -214,7 +213,7 @@ class BaseUser:
         if roles:
             payload["roles"] = roles
         if name:
-            payload["name"] = name
+            payload["username"] = name
         if activate and not deactivate:
             payload["is_active"] = True
         elif deactivate and not activate:

{seqslab-cli-3.3.7 → seqslab-cli-3.3.8/python/seqslab_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seqslab-cli
-Version: 3.3.7
+Version: 3.3.8
 Summary: Atgenomix SeqsLab Command Line Tool
 Home-page: https://github.com/AnomeGAP/seqslab-cli
 Author: Allen Chang

{seqslab-cli-3.3.7 → seqslab-cli-3.3.8}/python/seqslab_cli.egg-info/SOURCES.txt

@@ -17,6 +17,7 @@ python/seqslab/usage_logger.py
 python/seqslab/auth/__init__.py
 python/seqslab/auth/azuread.py
 python/seqslab/auth/commands.py
+python/seqslab/auth/utils.py
 python/seqslab/drs/__init__.py
 python/seqslab/drs/commands.py
 python/seqslab/drs/api/__init__.py

seqslab-cli-3.3.7/python/seqslab/organization/commands.py

@@ -1,77 +0,0 @@
-#!/usr/bin/env python3
-# Standard Library
-import errno
-from typing import List
-
-import requests
-import yarl
-from nubia import argument, command
-from requests import HTTPError
-from seqslab.auth.commands import BaseAuth as Auth
-from seqslab.organization.resource.base import BaseResource
-from termcolor import cprint
-
-"""
-Copyright (C) 2023, Atgenomix Incorporated.
-
-All Rights Reserved.
-
-This program is an unpublished copyrighted work which is proprietary to
-Atgenomix Incorporated and contains confidential information that is not to
-be reproduced or disclosed to any other person or entity without prior
-written consent from Atgenomix, Inc. in each and every instance.
-
-Unauthorized reproduction of this program as well as unauthorized
-preparation of derivative works based upon the program or distribution of
-copies by sale, rental, lease or lending are violations of federal copyright
-laws and state trade secret laws, punishable by civil and criminal penalties.
-"""
-
-
-class BaseOrg:
-    @command
-    @argument(
-        "id",
-        type=str,
-        positional=False,
-        description="Specify an organization ID (required).",
-    )
-    @argument(
-        "uri",
-        type=List[str],
-        positional=False,
-        description="Specify the redirect URI for auth code flow (optional). If no URI is provided, "
-        "all existing registered URIs will be removed.",
-    )
-    def redirect_uri(self, id: str, uri: List[str] = [], **kwargs) -> int:
-        """
-        Register redirect URI(s) for auth code flow.
-        """
-        for u in uri:
-            o = yarl.URL(u)
-            if not o.scheme or not o.host:
-                cprint(f"Invalid URI '{u}'", "red")
-                return -1
-
-        try:
-            token = Auth.get_token().get("tokens").get("access")
-            BaseResource.request_wrapper(
-                callback=requests.post,
-                url=BaseResource.MGMT_ORG_URL.format(organization=id),
-                headers={"Authorization": f"Bearer {token}"},
-                data={"redirect_uris": uri},
-                status=[requests.codes.ok],
-            )
-        except HTTPError as e:
-            cprint(str(e), "red")
-            return errno.EPROTO
-        else:
-            return 0
-
-
-@command
-class Org(BaseOrg):
-    """Organization commands"""
-
-    def __init__(self):
-        super().__init__()