nsarchive 3.0.0a2__py3-none-any.whl → 3.0.0a4__py3-none-any.whl

nsarchive/__init__.py

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

nsarchive/cls/entities.py

@@ -1,7 +1,8 @@
 import requests
 import time
 import typing
-import urllib.parse
+import urllib
+import warnings
 
 from .base import NSID
 
@@ -37,6 +38,7 @@ class PositionPermissions:
         self.items = Permission("---r") # APPEND = vendre, MANAGE = gérer des items dont on n'est pas propriétaire (hors marketplace), EDIT = gérer des items dont on n'est pas propriétaire (dans le marketplace), READ = accéder au marketplace
         self.laws = Permission() # APPEND = proposer un texte de loi, MANAGE = accepter ou refuser une proposition, EDIT = modifier un texte, READ = /
         self.members = Permission("---r") # APPEND = créer des entités, MANAGE = modérer des entités (hors Discord), EDIT = modifier des entités, READ = voir le profil des entités
+        self.money = Permission("---r") # APPEND = créer des entités, MANAGE = modérer des entités (hors Discord), EDIT = modifier des entités, READ = voir le profil des entités
         self.national_channel = Permission() # APPEND = prendre la parole sur la chaîne nationale, MANAGE = voir qui peut prendre la parole, EDIT = modifier le planning de la chaîne nationale, READ = /
         self.organizations = Permission("---r") # APPEND = créer une nouvelle organisation, MANAGE = exécuter des actions administratives sur les organisations, EDIT = modifier des organisations, READ = voir le profil de n'importe quelle organisation
         self.reports = Permission() # APPEND = déposer plainte, MANAGE = accépter ou refuser une plainte, EDIT = /, READ = accéder à des infos supplémentaires pour une plainte
@@ -69,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
@@ -170,7 +190,13 @@ class User(Entity):
 
         self.xp: int = 0
         self.boosts: dict[str, int] = {}
-        self.groups: list[NSID] = []
+        self.votes: list[NSID] = []
+
+    def _load(self, _data: dict):
+        self.xp = _data['xp']
+        self.boosts = _data['boosts']
+
+        self.votes = [ NSID(vote) for vote in _data['votes'] ]
 
     def get_level(self) -> None:
         i = 0
@@ -255,37 +281,6 @@ class GroupInvite:
         self.level: str = 0
         self._expires: int = round(time.time()) + 604800
 
-class Share:
-    """
-    Action d'une entreprise
-
-    ## Attributs
-    - owner: `NSID`\n
-        Identifiant du titulaire de l'action
-    - price: `int`\n
-        Prix de l'action
-    """
-
-    def __getstate__(self) -> dict:
-        return {
-            "owner": self.owner,
-            "price": self.price
-        }
-
-    def __setstate__(self, state: dict):
-        self.owner: NSID = state['owner']
-        self.price: int = state['price']
-
-    def __init__(self, owner: NSID = NSID(0x0), price: int = 10):
-        self.owner: NSID = owner
-        self.price: int = price
-
-    def assign_owner(self, owner: NSID):
-        self.owner = owner
-
-    def set_price(self, price: int):
-        self.price = price
-
 class Organization(Entity):
     """
     Entité collective
@@ -308,13 +303,22 @@ 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] = []
 
-        self.parts: list[Share] = 50 * [ Share(self.owner.id, 0) ]
+    def _load(self, _data: dict):
+        self.avatar_url = self._url + '/avatar'
+
+        for _member in _data['members']:
+            member = GroupMember(_member['id'])
+            member.permission_level = _member['level']
+
+            self.members.append(member)
+
+        self.certifications = _data['certifications']
 
     def add_certification(self, certification: str, __expires: int = 2419200) -> None:
         res = requests.post(f"{self._url}/add_certification?name={certification}&duration={__expires}", headers = default_headers)
@@ -364,29 +368,5 @@ class Organization(Entity):
     def get_members_by_attr(self, attribute: str = "id") -> list[str]:
         return [ member.__getattribute__(attribute) for member in self.members ]
 
-    def get_shares(self, include_worth: bool = False) -> dict[str, int] | dict[str, dict[str, int]]:
-        shares = {}
-
-        for share in self.parts:
-            if include_worth:
-                if share.owner in shares.keys():
-                    shares[share.owner]['count'] += 1
-                    shares[share.owner]['worth'] += share.price
-                else:
-                    shares[share.owner] = {
-                        'count': 1,
-                        'worth': share.price
-                    }
-            else:
-                if share.owner in shares.keys():
-                    shares[share.owner] += 1
-                else:
-                    shares[share.owner] = 1
-
-        return shares
-
     def save_avatar(self, data: bytes = None):
-        if not data:
-            return
-
-        self.avatar = data
+        pass

nsarchive/instances/_entities.py

@@ -51,53 +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 "parts" 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.xp = _data['xp']
-            entity.boosts = _data['boosts']
-
-            entity.votes = [ NSID(vote) for vote in _data['votes'] ]
-            entity.groups = [ NSID(group) for group in _data['groups'] ]
-        elif _data['_type'] == 'organization':
+            entity._load(_data)
+        elif _data['_class'] == 'organization':
             entity = Organization(id)
             entity._url = f"{self.url}/model/organizations/{id}"
 
-            res = requests.get(f"{entity._url}/avatar")
+            _owner = _data['owner']
 
-            if res.status_code == 200:
-                entity.avatar = res.content
+            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:
-                warnings.warn(f"Failed to get avatar for {id}")
-
-            entity.owner = self.get_entity(NSID(_data['owner_id']))
-
-            for _member in _data['members']:
-                member = GroupMember(_member['id'])
-                member.permission_level = _member['level']
-
-                entity.append(member)
-
-            entity.parts = []
-
-            for attrs in _data['parts']:
-                owner = attrs["owner"]
-                entity.parts.extend(attrs['count'] * [ Share(NSID(owner), attrs['worth'] // attrs['count']) ])
+                entity.owner = self.get_entity(0x0)
 
-            entity.certifications = _data['certifications']
+            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():
@@ -106,8 +87,20 @@ 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]:
+        print(entity._url)
+        res = requests.get(f"{entity._url}/groups", headers = self.default_headers)
+
+        if res.status_code == 200:
+            return res.json()
+        else:
+            res.raise_for_status()
+            return []
+
     def save_entity(self, entity: Entity):
         """
         Fonction permettant de créer ou modifier une entité.
@@ -137,7 +130,6 @@ class EntityInstance(Instance):
             _data['owner_id'] = NSID(entity.owner.id) if entity.owner else NSID("0")
             _data['members'] = []
             _data['certifications'] = entity.certifications
-            _data['parts'] = entity.get_shares(True)
 
             for member in entity.members:
                 _member = {
@@ -151,7 +143,7 @@ class EntityInstance(Instance):
         elif type(entity) == User:
             _data['xp'] = entity.xp
             _data['boosts'] = entity.boosts
-            # _data['votes'] = [ NSID(vote) for vote in entity.votes]
+            _data['votes'] = [ NSID(vote) for vote in entity.votes]
         else:
             return
 
@@ -191,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:
         """
@@ -224,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.0a2.dist-info → nsarchive-3.0.0a4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nsarchive
-Version: 3.0.0a2
+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.0a2.dist-info → nsarchive-3.0.0a4.dist-info}/RECORD

@@ -1,15 +1,15 @@
-nsarchive/__init__.py,sha256=01mYNtrFbmeU_GUIfDd21iWBJSGF650KAUvYphaXc6k,656
+nsarchive/__init__.py,sha256=_IK4p7rSwTN9GahaxnL4gkgXOCCkT0vMgBXbJY_MXVA,656
 nsarchive/assets/default_avatar.png,sha256=n-4vG_WPke8LvbY3ZU6oA-H-OtRoIu7woKnRq9DCIlI,51764
 nsarchive/cls/archives.py,sha256=3vyGOBZUE-B-G_QMJXRIPD0d-1O5z4wqv-2MRf5AQdA,2506
 nsarchive/cls/base.py,sha256=R6ZD2_DVOvjTO6VZ0HteFWVmdW9fieyIpGF9P0PqYk4,7424
 nsarchive/cls/economy.py,sha256=soe3ATrtQem-u80vz8nXfsn_3TqMdhpolyTxRenH2C0,2742
-nsarchive/cls/entities.py,sha256=M2R55pP7j9_dl1RFMR9DouRabl9VzEVGmq4uIOcojPg,14303
+nsarchive/cls/entities.py,sha256=cc76FSkigUm_ryT_tzLNIDj-TDIAOLtleXy9xutLvnc,14072
 nsarchive/cls/republic.py,sha256=16NFNCkJxOeVRd6BoJ68AlrTESQgRfZ5FSFlNWTEdK0,4103
 nsarchive/instances/_economy.py,sha256=kVIbsCIrctV5yA3nlnSEYkJ8Cuh74YnQKtntIXTqOY0,8892
-nsarchive/instances/_entities.py,sha256=3AYJAARXYhxsEEQaahBvJyT0iOsR1KhUDXOBeAvax4w,7923
+nsarchive/instances/_entities.py,sha256=6diGZVdtCBgw3ybnx09nBMfLrA1zpNM0DZT7grxKHCo,9319
 nsarchive/instances/_republic.py,sha256=M8k2rZJvQGzOyZlmqRDiB-d615hZOqD3kuRrgYP4JqA,12004
 nsarchive/utils.py,sha256=qpQCZLlbVApOLtCI2ml54QwUld6K8fDxyBfwzofqXzw,610
-nsarchive-3.0.0a2.dist-info/LICENSE,sha256=aFLFZg6LEJFpTlNQ8su3__jw4GfV-xWBmC1cePkKZVw,35802
-nsarchive-3.0.0a2.dist-info/METADATA,sha256=N5tE2JUA7T-612kyRTjfKeLwZmz3Cd6i6fO98M9UXPQ,657
-nsarchive-3.0.0a2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-nsarchive-3.0.0a2.dist-info/RECORD,,
+nsarchive-3.0.0a4.dist-info/LICENSE,sha256=aFLFZg6LEJFpTlNQ8su3__jw4GfV-xWBmC1cePkKZVw,35802
+nsarchive-3.0.0a4.dist-info/METADATA,sha256=nRgP7-B_I5F4wKUuh5-hWhiBh2euagI7ATpr7T3_NDY,657
+nsarchive-3.0.0a4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+nsarchive-3.0.0a4.dist-info/RECORD,,