nsarchive 3.0.0a3__tar.gz → 3.0.0a4__tar.gz

{nsarchive-3.0.0a3 → nsarchive-3.0.0a4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nsarchive
-Version: 3.0.0a3
+Version: 3.0.0a4
 Summary: API-wrapper pour récupérer des données liées à Nation
 License: GPL-3.0
 Author: happex

{nsarchive-3.0.0a3 → nsarchive-3.0.0a4}/nsarchive/__init__.py

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

{nsarchive-3.0.0a3 → nsarchive-3.0.0a4}/nsarchive/cls/entities.py

@@ -71,10 +71,28 @@ class Position:
         self.name: str = "Inconnue"
         self.id = id
         self.permissions: PositionPermissions = PositionPermissions()
+        self.manager_permissions: PositionPermissions = PositionPermissions()
+
+        self._url: str = ""
 
     def __repr__(self):
         return self.id
 
+    def update_permisions(self, **permissions: str):
+        query = "&".join(f"{k}={ urllib.parse.quote(v) }" for k, v in permissions.items())
+
+        res = requests.post(f"{self._url}/update_permissions?{query}", headers = default_headers)
+
+        if res.status_code == 200:
+            self.permissions.merge(permissions)
+        else:
+            res.raise_for_status()
+
+    def _load(self, _data: dict):
+        self.name = _data['name']
+        self.permissions.merge(_data['permissions'])
+        self.manager_permissions.merge(_data['manager_permissions'])
+
 class Entity:
     """
     Classe de référence pour les entités
@@ -285,19 +303,14 @@ class Organization(Entity):
         super().__init__(NSID(id))
 
         self.owner: Entity = User(NSID(0x0))
-        self.avatar: bytes = utils.open_asset('default_avatar.png')
+        self.avatar_url: str = self._url + '/avatar'
 
         self.certifications: dict = {}
         self.members: list[GroupMember] = []
         self.invites: dict[GroupInvite] = []
 
     def _load(self, _data: dict):
-        res = requests.get(f"{self._url}/avatar")
-
-        if res.status_code == 200:
-            self.avatar = res.content
-        else:
-            warnings.warn(f"Failed to get avatar for {self.id}")
+        self.avatar_url = self._url + '/avatar'
 
         for _member in _data['members']:
             member = GroupMember(_member['id'])
@@ -356,7 +369,4 @@ class Organization(Entity):
         return [ member.__getattribute__(attribute) for member in self.members ]
 
     def save_avatar(self, data: bytes = None):
-        if not data:
-            return
-
-        self.avatar = data
+        pass

{nsarchive-3.0.0a3 → nsarchive-3.0.0a4}/nsarchive/instances/_entities.py

@@ -51,29 +51,34 @@ class EntityInstance(Instance):
 
         if _data is None: # ID inexistant chez les entités
             return None
-        elif "xp" in _data.keys():
-            _data['_type'] = 'user'
-        elif "members" in _data.keys():
-            _data['_type'] = 'organization'
-        else:
-            _data['_type'] = 'entity'
 
-        if _data['_type'] == 'user':
+        if _data['_class'] == 'user':
             entity = User(id)
             entity._url = f"{self.url}/model/individuals/{id}"
 
             entity._load(_data)
-        elif _data['_type'] == 'organization':
+        elif _data['_class'] == 'organization':
             entity = Organization(id)
             entity._url = f"{self.url}/model/organizations/{id}"
-            entity.owner = self.get_entity(_data["owner_id"])
+
+            _owner = _data['owner']
+
+            if _owner['_class'] == 'individuals':
+                entity.owner = User(_owner['id'])
+                entity.owner._load(_owner)
+            elif _owner['class'] == 'organizations':
+                entity.owner = Organization(_owner['id'])
+                entity.owner._load(_owner)
+            else:
+                entity.owner = self.get_entity(0x0)
 
             entity._load(_data)
         else: 
             entity = Entity(id)
+            entity._url = f"{self.url}/model/entities/{id}"
 
         entity.name = _data['name']
-        entity.position = self.get_position(_data['position']) # Métier si c'est un utilisateur, domaine professionnel si c'est un collectif
+        entity.position._load(_data['position']) # Métier si c'est un utilisateur, domaine professionnel si c'est un collectif
         entity.registerDate = _data['register_date']
 
         for  key, value in _data.get('additional', {}).items():
@@ -82,6 +87,8 @@ class EntityInstance(Instance):
             else:
                 entity.additional[key] = value
 
+        entity.position._url = f"{self.url}/positions/{id}"
+
         return entity
 
     def get_entity_groups(self, entity: User) -> list[Organization]:
@@ -176,20 +183,65 @@ class EntityInstance(Instance):
         - `list[.Entity | .User | .Organization]`
         """
 
-        if "_type" in query.keys():
-            if query["_type"] == "individual":
-                del query["_type"]
+        if "_class" in query.keys():
+            if query["_class"] == "individuals":
+                del query["_class"]
                 _res = self.fetch('individuals', **query)
-            elif query["_type"] == "organization":
-                del query["_type"]
+            elif query["_class"] == "organizations":
+                del query["_class"]
                 _res = self.fetch('organizations', **query)
             else:
-                del query["_type"]
+                del query["_class"]
                 _res = self.fetch('entities', **query)
         else:
             _res = self.fetch('entities', **query)
 
-        return [ self.get_entity(NSID(entity['id'])) for entity in _res if entity is not None ]
+        res = []
+
+        for _entity in _res:
+            if _entity is None: continue
+
+            if _entity['_class'] == 'individuals':
+                entity = User(_entity["id"])
+                entity._url = f"{self.url}/model/individuals/{_entity['id']}"
+
+                entity._load(_entity)
+            elif _entity['_class'] == 'organizations':
+                entity = Organization(_entity["id"])
+                entity._url = f"{self.url}/model/organizations/{_entity['id']}"
+
+                _owner = _entity['owner']
+                if _owner['_class'] == 'individuals':
+                    entity.owner = User(_owner['id'])
+                    entity.owner._load(_owner)
+                elif _owner['class'] == 'organizations':
+                    entity.owner = Organization(_owner['id'])
+                    entity.owner._load(_owner)
+                else:
+                    entity.owner = self.get_entity(0x0)
+
+                entity._load(_entity)
+            else:
+                entity = Entity(_entity["id"])
+                entity._url = f"{self.url}/model/organizations/{_entity['id']}"
+
+            entity.name = _entity['name']
+            entity.position._load(_entity['position'])
+            entity.registerDate = _entity['register_date']
+
+            for  key, value in _entity.get('additional', {}).items():
+                if isinstance(value, str) and value.startswith('\n'):
+                    entity.additional[key] = int(value[1:])
+                else:
+                    entity.additional[key] = value
+
+            entity.position._url = f"{self.url}/positions/{_entity['id']}"
+
+            res.append(entity)
+
+        return res
+
+
 
     def get_position(self, id: str) -> Position:
         """
@@ -209,7 +261,9 @@ class EntityInstance(Instance):
             return None
 
         position = Position(id)
+        position._url = f"{self.url}/positions/{id}"
         position.name = _data['name']
         position.permissions.merge(_data['permissions'])
+        position.manager_permissions.merge(_data['manager_permissions'])
 
         return position

{nsarchive-3.0.0a3 → nsarchive-3.0.0a4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nsarchive"
-version = "3.0.0a3"
+version = "3.0.0a4"
 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"