nsarchive 3.0.0a5__tar.gz → 3.0.0a7__tar.gz

{nsarchive-3.0.0a5 → nsarchive-3.0.0a7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nsarchive
-Version: 3.0.0a5
+Version: 3.0.0a7
 Summary: API-wrapper pour récupérer des données liées à Nation
 License: GPL-3.0
 Author: happex
@@ -12,6 +12,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: pillow (>=10.4,<11.0)
+Requires-Dist: requests (>=2.31,<3.0)
 Description-Content-Type: text/markdown
 
 # NSArchive

{nsarchive-3.0.0a5 → nsarchive-3.0.0a7}/nsarchive/__init__.py

@@ -1,7 +1,7 @@
 """
 nsarchive - API-wrapper pour récupérer des données liées à Nation.
 
-Version: 3.0.0a5
+Version: 3.0.0a7
 License: GPL-3.0
 Auteur : happex <110610727+okayhappex@users.noreply.github.com>
 

{nsarchive-3.0.0a5 → nsarchive-3.0.0a7}/nsarchive/cls/entities.py

@@ -92,6 +92,7 @@ class Position:
             res.raise_for_status()
 
     def _load(self, _data: dict):
+        self.id = _data['id']
         self.name = _data['name']
         self.permissions.merge(_data['permissions'])
         self.manager_permissions.merge(_data['manager_permissions'])

{nsarchive-3.0.0a5 → nsarchive-3.0.0a7}/nsarchive/instances/_entities.py

@@ -52,12 +52,12 @@ class EntityInstance(Instance):
         if _data is None: # ID inexistant chez les entités
             return None
 
-        if _data['_class'] == 'user':
+        if _data['_class'] == 'individuals':
             entity = User(id)
             entity._url = f"{self.url}/model/individuals/{id}"
 
             entity._load(_data)
-        elif _data['_class'] == 'organization':
+        elif _data['_class'] == 'organizations':
             entity = Organization(id)
             entity._url = f"{self.url}/model/organizations/{id}"
 
@@ -92,11 +92,23 @@ class EntityInstance(Instance):
         return entity
 
     def get_entity_groups(self, entity: User) -> list[Organization]:
-        print(entity._url)
         res = requests.get(f"{entity._url}/groups", headers = self.default_headers)
 
         if res.status_code == 200:
-            return res.json()
+            data = res.json()
+            groups = []
+
+            for grp in data:
+                if grp is None: continue
+
+                group = Organization(grp["id"])
+                group._url = f"{self.url}/model/organizations/{grp['id']}"
+
+                group._load(grp)
+
+                groups.append(group)
+
+            return groups
         else:
             res.raise_for_status()
             return []

{nsarchive-3.0.0a5 → nsarchive-3.0.0a7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nsarchive"
-version = "3.0.0a5"
+version = "3.0.0a7"
 description = "API-wrapper pour récupérer des données liées à Nation"
 authors = ["happex <110610727+okayhappex@users.noreply.github.com>"]
 license = "GPL-3.0"
@@ -9,6 +9,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "^3.10"
 pillow = "^10.4"
+requests = "^2.31"
 
 [build-system]
 requires = ["poetry-core"]