upd

swarmauri · Nov 1, 2024 · 445f40c · 445f40c
1 parent 9ea5f79
commit 445f40c
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 51 deletions.
diff --git a/pkgs/crouton_client/crouton_client/UUID.py b/pkgs/crouton_client/crouton_client/UUID.py
@@ -1,9 +1,9 @@
-from pydantic import BaseModel
-
-# UUID
+import os
 from hashlib import sha256
 from uuid import UUID, uuid4, uuid5
+from pydantic import BaseModel
 
+NAMESPACE_URL_UUID = os.getenv("NAMESPACE_URL_UUID", "default")
 
 class UUIDGenerator(BaseModel):
   namespace: UUID = UUID(NAMESPACE_URL_UUID)

diff --git a/pkgs/crouton_client/crouton_client/async.py b/pkgs/crouton_client/crouton_client/async.py
@@ -24,7 +24,7 @@ async def get(self, resource: str, item_id: str = None):
                 raise ValueError
 
 
-    def post(self, resource: str, data_obj: dict):
+    async def post(self, resource: str, data_obj: dict):
         data_obj.update({'id': UUIDGenerator().create()})
         res = r.post(self.API_ROOT+resource+self.ACCESS_STRING, 
                 json=data_obj)
@@ -36,7 +36,7 @@ def post(self, resource: str, data_obj: dict):
             raise ValueError
 
 
-    def put(self, resource: str, data_obj: dict, item_id: str = None):
+    async def put(self, resource: str, data_obj: dict, item_id: str = None):
         if item_id:
             res = r.put(self.API_ROOT+resource+'/'+item_id+self.ACCESS_STRING, 
                     json=data_obj)
@@ -47,7 +47,7 @@ def put(self, resource: str, data_obj: dict, item_id: str = None):
                 print(res.json())
                 raise ValueError
 
-    def delete(self, resource: str, item_id: str = None):
+    async def delete(self, resource: str, item_id: str = None):
         if item_id:
             res = r.delete(self.API_ROOT+resource+'/'+item_id+self.ACCESS_STRING)
         else:

diff --git a/pkgs/crouton_client/crouton_client/blocking.py b/pkgs/crouton_client/crouton_client/blocking.py
@@ -3,62 +3,67 @@
 
 import requests as r
 
-def api_get_call(resource: str, item_id: str = None):
-        if item_id:
-                res = r.get(API_ROOT+resource+'/'+item_id+ACCESS_STRING)
+class CroutonClient:
+        def __init__(self, API_ROOT, ACCESS_STRING):
+                self.API_ROOT = API_ROOT
+                self.ACCESS_STRING = ACCESS_STRING
+
+        def api_get_call(resource: str, item_id: str = None):
+                if item_id:
+                        res = r.get(API_ROOT+resource+'/'+item_id+ACCESS_STRING)
+                        if res.status_code == 200:
+                                return res.json()
+                        else:
+                                print(res.status_code)
+                                print(res.json())
+
+                                # Test
+                                raise ValueError(res.status_code)
+                else:
+                        res = r.get(API_ROOT+resource+ACCESS_STRING)
+                        if res.status_code == 200:
+                                return res.json()
+                        else:
+                                print(res.status_code)
+                                print(res.json())
+
+                                # Test
+                                raise ValueError(res.json())
+
+
+        def api_post_call(resource: str, data_obj: dict):
+                if 'id' not in data_obj:
+                        data_obj.update({'id': UUIDGenerator().create()})
+                res = r.post(API_ROOT+resource+ACCESS_STRING, 
+                        json=data_obj)
                 if res.status_code == 200:
                         return res.json()
                 else:
                         print(res.status_code)
                         print(res.json())
-
-                        # Test
-                        raise ValueError(res.status_code)
-        else:
-                res = r.get(API_ROOT+resource+ACCESS_STRING)
+                        raise ValueError
+
+
+        def api_put_call(resource: str, data_obj: dict, item_id: str):
+                res = r.put(API_ROOT+resource+'/'+item_id+ACCESS_STRING, 
+                        json=data_obj)
                 if res.status_code == 200:
                         return res.json()
                 else:
                         print(res.status_code)
                         print(res.json())
-
-                        # Test
-                        raise ValueError(res.json())
-
+                        raise ValueError
 
-def api_post_call(resource: str, data_obj: dict):
-        if 'id' not in data_obj:
-                data_obj.update({'id': UUIDGenerator().create()})
-        res = r.post(API_ROOT+resource+ACCESS_STRING, 
-                json=data_obj)
-        if res.status_code == 200:
-                return res.json()
-        else:
-                print(res.status_code)
-                print(res.json())
-                raise ValueError
 
+        def api_delete_call(resource: str, item_id: str = None):
+                if item_id:
+                        res = r.delete(API_ROOT+resource+'/'+item_id+ACCESS_STRING)
+                else:
+                        res = r.delete(API_ROOT+resource+'/'+item_id+ACCESS_STRING)
 
-def api_put_call(resource: str, data_obj: dict, item_id: str):
-        res = r.put(API_ROOT+resource+'/'+item_id+ACCESS_STRING, 
-                json=data_obj)
-        if res.status_code == 200:
-                return res.json()
-        else:
-                print(res.status_code)
-                print(res.json())
-                raise ValueError
-
-
-def api_delete_call(resource: str, item_id: str = None):
-        if item_id:
-                res = r.delete(API_ROOT+resource+'/'+item_id+ACCESS_STRING)
-        else:
-                res = r.delete(API_ROOT+resource+'/'+item_id+ACCESS_STRING)
-
-        if res.status_code == 200:
-                return res.json()
-        else:
-                print(res.status_code, res.json())
-                raise ValueError 
+                if res.status_code == 200:
+                        return res.json()
+                else:
+                        print(res.status_code, res.json())
+                        raise ValueError