vc-utils 2.0__tar.gz → 3.0__tar.gz

{vc_utils-2.0 → vc_utils-3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vc-utils
-Version: 2.0
+Version: 3.0
 Summary: Vulcan Coalition Python Utility Library
 Home-page: https://github.com/vulcan-coalition/vulcan-utils
 Author: Chatavut Viriyasuthee
@@ -35,7 +35,7 @@ Vulcan python utility
 ## Installation
 
 ```bash
-pip install vulcan-utils
+pip install vc-utils
 ```
 
 ## Usage
@@ -48,12 +48,13 @@ export LINKAGE_CLIENT_ID="test-client-id"
 export LINKAGE_CLIENT_SECRET="test-client-secret"
 
 export LINKAGE_M2M_HOST="https://application-linkage.vulcanproduct.com"
+export LINKAGE_U2M_HOST="https://account-linkage.vulcanproduct.com"
 ```
 
 Then you can import and use the Linkage API in your code:
 
 ```python
-from vulcan_utils import linkage
+import linkage
 ```
 
 ## Test

{vc_utils-2.0 → vc_utils-3.0}/README.md

@@ -11,7 +11,7 @@ Vulcan python utility
 ## Installation
 
 ```bash
-pip install vulcan-utils
+pip install vc-utils
 ```
 
 ## Usage
@@ -24,12 +24,13 @@ export LINKAGE_CLIENT_ID="test-client-id"
 export LINKAGE_CLIENT_SECRET="test-client-secret"
 
 export LINKAGE_M2M_HOST="https://application-linkage.vulcanproduct.com"
+export LINKAGE_U2M_HOST="https://account-linkage.vulcanproduct.com"
 ```
 
 Then you can import and use the Linkage API in your code:
 
 ```python
-from vulcan_utils import linkage
+import linkage
 ```
 
 ## Test

{vc_utils-2.0 → vc_utils-3.0}/linkage/__init__.py

@@ -1 +1,2 @@
 from .session import init, Linkage_Application, get_user_data, get_authn_req_url, get_token, revoke
+from .achievement import Achievement

vc_utils-3.0/linkage/achievement.py

@@ -0,0 +1,9 @@
+from pydantic import BaseModel
+from typing import Any, List, Optional
+
+
+class Achievement(BaseModel):
+    title: str
+    description: str
+    metadata: Any = None
+    files: Optional[List[str]] = None # paths to files to be uploaded

{vc_utils-2.0 → vc_utils-3.0}/linkage/session.py

@@ -3,6 +3,7 @@ import logging
 from . import key_generator
 import aiohttp
 from urllib.parse import urlencode
+from .achievement import Achievement
 
 
 AUTHORIZE_ENDPOINT = "/authorize"
@@ -14,6 +15,7 @@ CLIENT_ID = None
 CLIENT_SECRET = None
 
 LINKAGE_M2M_HOST = None
+LINKAGE_U2M_HOST = None
 
 async def init():
     LINKAGE_OPENID_CONF_PATH = os.getenv("LINKAGE_OPENID_CONF_PATH", None)
@@ -46,6 +48,11 @@ async def init():
     if not LINKAGE_M2M_HOST:    
         raise Exception("LINKAGE_M2M_HOST environment variable must be set")
     
+    global LINKAGE_U2M_HOST
+    LINKAGE_U2M_HOST = os.getenv("LINKAGE_U2M_HOST", None)
+    if not LINKAGE_U2M_HOST:    
+        raise Exception("LINKAGE_U2M_HOST environment variable must be set")
+    
 
 async def application_get_token():
     # use separate session to avoid token refresh logic in Linkage_Application_Session
@@ -120,10 +127,91 @@ class Linkage_Application:
             error_data = await resp.json()
             raise Exception(error_data)
         return await resp.json()
+    
 
+    async def update_achievement(self, session, user_id, achievement):
+        """
+        POST /achievements/user/{user_id}
+        title: str = Form(...),
+        description: str = Form(...),
+        metadata: Any = Form(None),
+        files: List[UploadFile] = File([]),
+        """
+        uri = f"{LINKAGE_M2M_HOST}/achievements/user/{user_id}"
+        opened_files = []
+        try:
+            data = aiohttp.FormData()
+            data.add_field("title", achievement.title)
+            data.add_field("description", achievement.description)
+            if achievement.metadata is not None:
+                data.add_field("metadata", str(achievement.metadata))
+            if achievement.files:
+                for file_path in achievement.files:
+                    f = open(file_path, "rb")
+                    opened_files.append(f)
+                    data.add_field("files", f, filename=os.path.basename(file_path))
+            resp = await self.linkage_post(session, uri, data=data)
+            if resp.status != 200:
+                error_data = await resp.json()
+                raise Exception(error_data)
+        except Exception as e:
+            raise e
+        finally:
+            for f in opened_files:
+                f.close()
+        
+        return await resp.json()
+    
 
+    async def batch_read_achievements(self, session, user_ids, app_ids, expiration=300):
+        """
+        POST /achievements/batch
 
-async def get_user_data(token):
+        user_ids: List[str] = Body(..., embed=True),
+        app_ids: List[str] = Body(..., embed=True),
+        expiration: int = Query(300, description="Expiration time for signed URLs in seconds"),
+        
+        """
+        uri = f"{LINKAGE_M2M_HOST}/achievements/batch?expiration={expiration}"
+        payload = {
+            "user_ids": user_ids,
+            "app_ids": app_ids,
+        }
+        resp = await self.linkage_post(session, uri, json=payload)
+        if resp.status != 200:
+            error_data = await resp.json()
+            raise Exception(error_data)
+        
+        # convert the response to a dict of user_id -> list of achievements
+        # data has this format: {user_id: {"s": status, "achievements": {"app_id": {"s": status, "data": {title, description, metadata, files}}}}}
+        data = await resp.json()
+        result = {}
+        for user_id, value in data.items():
+            if value.get("s") != "ok":
+                logging.warning(f"Failed to fetch achievements for user {user_id}, status: {value.get('s')}")
+                continue
+            
+            achs = []
+            for app_id, ach_value in value.get("achievements", {}).items():
+                if app_id not in app_ids:
+                    logging.warning(f"Received achievement data for unexpected app_id {app_id}, skipping")
+                    continue
+                if ach_value.get("s") != "ok":
+                    logging.warning(f"Failed to fetch achievement for user {user_id} and app {app_id}, status: {ach_value.get('s')}")
+                    continue
+                ach_data = ach_value.get("data", {})
+                ach = Achievement(
+                    title=ach_data.get("title", ""),
+                    description=ach_data.get("description", ""),
+                    metadata=ach_data.get("metadata", None),
+                    files=[d['url_download'] for d in ach_data.get("download_links", [])]
+                )
+                achs.append(ach)
+            result[user_id] = achs
+        return result
+            
+
+async def get_user_data(token, spec_id=None):
     if not token:
         return None
     
@@ -131,11 +219,18 @@ async def get_user_data(token):
         "Authorization": f"Bearer {token}"
     }
     async with aiohttp.ClientSession() as session:
-        async with session.get(USERINFO_ENDPOINT, headers=headers) as resp:
-            if resp.status != 200:
-                error_data = await resp.json()
-                raise Exception(error_data)
-            return await resp.json()
+        if spec_id is not None:
+            async with session.get(f"{LINKAGE_U2M_HOST}/data/{spec_id}", headers=headers) as resp:
+                if resp.status != 200:
+                    error_data = await resp.json()
+                    raise Exception(error_data)
+                return await resp.json()
+        else:
+            async with session.get(USERINFO_ENDPOINT, headers=headers) as resp:
+                if resp.status != 200:
+                    error_data = await resp.json()
+                    raise Exception(error_data)
+                return await resp.json()
 
 
 def get_authn_req_url(scope, redirect_uri):

{vc_utils-2.0 → vc_utils-3.0}/setup.py

@@ -11,7 +11,7 @@ import shutil
 
 setup(
     name="vc-utils",
-    version="2.0",
+    version="3.0",
     author="Chatavut Viriyasuthee",
     author_email="chatavut@lab.ai",
     description="Vulcan Coalition Python Utility Library",

{vc_utils-2.0 → vc_utils-3.0}/vc_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vc-utils
-Version: 2.0
+Version: 3.0
 Summary: Vulcan Coalition Python Utility Library
 Home-page: https://github.com/vulcan-coalition/vulcan-utils
 Author: Chatavut Viriyasuthee
@@ -35,7 +35,7 @@ Vulcan python utility
 ## Installation
 
 ```bash
-pip install vulcan-utils
+pip install vc-utils
 ```
 
 ## Usage
@@ -48,12 +48,13 @@ export LINKAGE_CLIENT_ID="test-client-id"
 export LINKAGE_CLIENT_SECRET="test-client-secret"
 
 export LINKAGE_M2M_HOST="https://application-linkage.vulcanproduct.com"
+export LINKAGE_U2M_HOST="https://account-linkage.vulcanproduct.com"
 ```
 
 Then you can import and use the Linkage API in your code:
 
 ```python
-from vulcan_utils import linkage
+import linkage
 ```
 
 ## Test

{vc_utils-2.0 → vc_utils-3.0}/vc_utils.egg-info/SOURCES.txt

@@ -1,6 +1,7 @@
 README.md
 setup.py
 linkage/__init__.py
+linkage/achievement.py
 linkage/key_generator.py
 linkage/session.py
 vc_utils.egg-info/PKG-INFO