nsarchive 3.0.0a8__py3-none-any.whl → 3.0.0b2__py3-none-any.whl

nsarchive/__init__.py

@@ -1,8 +1,8 @@
 """
 nsarchive - API-wrapper pour récupérer des données liées à Nation.
 
-Version: 3.0.0-alpha.8
-Date de sortie: 2025-08-04
+Version: 3.0.0-beta.2
+Date de sortie: 2025-08-06
 License: GPL-3.0
 Auteur : happex <110610727+okayhappex@users.noreply.github.com>
 
@@ -22,6 +22,10 @@ from .models.republic import *
 from .models.state import *
 from .models.justice import *
 
+from .models.scale import *
+
+from . import errors
+
 # Import des interfaces
 from .models.base import Interface
 from .interfaces._entities import EntityInterface

nsarchive/errors/__init__.py

@@ -0,0 +1 @@
+from . import _globals as globals

nsarchive/errors/_globals.py

@@ -0,0 +1,29 @@
+class ServerDownError(Exception):
+    def __init__(self, *args):
+        super().__init__(*args)
+
+# 4XX
+
+class MissingParamError(Exception): # 400
+    def __init__(self, *args):
+        super().__init__(*args)
+
+class InvalidParamError(Exception): # 400
+    def __init__(self, *args):
+        super().__init__(*args)
+
+class AuthError(Exception): # 401
+    def __init__(self, *args):
+        super().__init__(*args)
+
+class PermissionError(Exception): # 403
+    def __init__(self, *args):
+        super().__init__(*args)
+
+class NotFoundError(Exception): # 404
+    def __init__(self, *args):
+        super().__init__(*args)
+
+class ConflictError(Exception): # 409
+    def __init__(self, *args):
+        super().__init__(*args)

nsarchive/interfaces/_economy.py

@@ -108,256 +108,4 @@ class EconomyInterface(Interface):
 
             res.append(account)
 
-        return res
-
-    """
-    ---- INVENTAIRES ----
-    """
-
-    def get_inventory(self, id: NSID) -> Inventory:
-        """
-        Récupère les informations d'un inventaire.
-
-        ## Paramètres
-        id: `NSID`\n
-            ID de l'inventaire.
-
-        ## Renvoie
-        - `.Inventory`
-        """
-
-        id = NSID(id)
-        res = requests.get(f"{self.url}/bank/inventories/{id}", headers = self.default_headers)
-
-        if res.status_code == 200:
-            _data = res.json()
-        else:
-            res.raise_for_status()
-            return
-
-        if _data is None:
-            return None
-
-        inventory = Inventory(id)
-        inventory._load(_data, self.url, self.default_headers)
-
-        return inventory
-
-    def save_inventory(self, inventory: Inventory) -> str:
-        """
-        Sauvegarde un inventaire dans la base de données.
-
-        ## Paramètres
-        - inventory: `.Inventory`\n
-            Inventaire à sauvegarder
-        """
-
-        _data = inventory.__dict__
-
-        res = requests.put(f"{self.url}/bank/register_inventory?owner={_data['owner_id']}", headers = self.default_headers, json = _data)
-
-        if res.status_code == 200:
-            inventory._url = f"{self.url}/bank/inventories/{inventory.id}"
-            inventory.id = res.json()['id']
-
-            return res.json()['digicode']
-        else:
-            res.raise_for_status()
-
-    def fetch_inventories(self, **query: typing.Any) -> list[Inventory]:
-        """
-        Récupère une liste d'inventaires en fonction d'une requête.
-
-        ## Paramètres
-        query: `**dict`\n
-            La requête pour filtrer les inventaires.
-
-        ## Renvoie
-        - `list[.Inventory]`
-        """
-
-        query = "&".join(f"{k}={ urllib.parse.quote(v) }" for k, v in query.items())
-
-        _res = requests.get(f"{self.url}/fetch/inventories?{query}", headers = self.default_headers)
-
-        if _res.status_code == 200:
-            _data = _res.json()
-        else:
-            _res.raise_for_status()
-            return []
-
-        res = []
-
-        for _inv in _data:
-            if not _inv: continue
-
-            inventory = Inventory(_inv["owner_id"])
-
-            inventory.id = NSID(_inv['id'])
-            inventory._load(_inv, self.url, self.default_headers)
-
-            res.append(inventory)
-
-        return res
-
-    """
-    ---- ITEMS ----
-    """
-
-    def get_item(self, id: NSID) -> Item:
-        """
-        Récupère les informations d'un item.
-
-        ## Paramètres
-        id: `NSID`\n
-            ID de l'item.
-
-        ## Renvoie
-        - `.Item`
-        """
-
-        id = NSID(id)
-        res = requests.get(f"{self.url}/marketplace/items/{id}", headers = self.default_headers)
-
-        if res.status_code == 200:
-            _data = res.json()
-        else:
-            res.raise_for_status()
-            return
-
-        if _data is None:
-            return None
-
-        item = Item()
-
-        item.id = id
-        item._load(_data, self.url, self.default_headers)
-
-        return item
-
-    def save_item(self, item: Item) -> None:
-        """
-        Sauvegarde un item dans le marketplace.
-
-        ## Paramètres
-        - item: `.Item`\n
-            Item à sauvegarder
-        """
-
-        _data = item.__dict__
-
-        res = requests.put(f"{self.url}/marketplace/register_item", headers = self.default_headers, json = _data)
-
-        if res.status_code == 200:
-            item._url = f"{self.url}/bank/inventories/{item.id}"
-            item.id = res.json()['id']
-        else:
-            res.raise_for_status()
-
-    def fetch_items(self, **query: typing.Any) -> list[Item]:
-        """
-        Récupère une liste d'items en fonction d'une requête.
-
-        ## Paramètres
-        query: `**dict`\n
-            La requête pour filtrer les items.
-
-        ## Renvoie
-        - `list[.Item]`
-        """
-
-        query = "&".join(f"{k}={ urllib.parse.quote(v) }" for k, v in query.items())
-
-        _res = requests.get(f"{self.url}/fetch/items?{query}", headers = self.default_headers)
-
-        if _res.status_code == 200:
-            _data = _res.json()
-        else:
-            _res.raise_for_status()
-            return []
-
-        res = []
-
-        for _item in _data:
-            if not _item: continue
-
-            item = Item()
-
-            item.id = NSID(_item['id'])
-            item._load(_item, self.url, self.default_headers)
-
-            res.append(item)
-
-        return res
-
-
-    """
-    ---- VENTES ----
-    """
-
-    def get_sale(self, id: NSID) -> Sale:
-        """
-        Récupère les informations d'une annonce.
-
-        ## Paramètres
-        id: `NSID`\n
-            ID de la annonce.
-
-        ## Renvoie
-        - `.Sale`
-        """
-
-        id = NSID(id)
-        res = requests.get(f"{self.url}/marketplace/sales/{id}", headers = self.default_headers)
-
-        if res.status_code == 200:
-            _data = res.json()
-        else:
-            res.raise_for_status()
-            return
-
-        if _data is None:
-            return None
-
-        sale = Sale()
-
-        sale.id = id
-        sale._load(_data, self.url, self.default_headers)
-
-        return sale
-
-    def fetch_sales(self, **query: typing.Any) -> list[Sale]:
-        """
-        Récupère une liste d'annonces en fonction d'une requête.
-
-        ## Paramètres
-        query: `**dict`\n
-            La requête pour filtrer les annonces.
-
-        ## Renvoie
-        - `list[.Sale]`
-        """
-
-        query = "&".join(f"{k}={ urllib.parse.quote(v) }" for k, v in query.items())
-
-        _res = requests.get(f"{self.url}/fetch/sales?{query}", headers = self.default_headers)
-
-        if _res.status_code == 200:
-            _data = _res.json()
-        else:
-            _res.raise_for_status()
-            return []
-
-        res = []
-
-        for _sale in _data:
-            if not _sale: continue
-
-            sale = Sale()
-
-            sale.id = NSID(_sale['id'])
-            sale._load(_sale, self.url, self.default_headers)
-
-            res.append(sale)
-
         return res

nsarchive/interfaces/_entities.py

@@ -1,6 +1,8 @@
 from ..models.base import *
 from ..models.entities import *
 
+from .. import errors
+
 from ..models import entities # Pour les default_headers
 
 class EntityInterface(Interface):
@@ -41,20 +43,35 @@ class EntityInterface(Interface):
         id = NSID(id)
 
         if _class == "user":
-            _data = self._get_by_ID('individuals', id)
+            res = requests.get(f"{self.url}/model/individuals/{id}", headers = self.default_headers, json = {})
         elif _class == "group":
-            _data = self._get_by_ID('organizations', id)
+            res = requests.get(f"{self.url}/model/organisations/{id}", headers = self.default_headers, json = {})
         else:
-            _data = self._get_by_ID('entities', id)
+            res = requests.get(f"{self.url}/model/entities/{id}", headers = self.default_headers, json = {})
+
+
+        # ERREURS
+
+        if res.status_code == 404:
+            return
+
+        if 500 <= res.status_code < 600:
+            res.raise_for_status()
+
+        if not 200 <= res.status_code < 300:
+            print(res.json()['message'])
+            return
+
 
-        if _data is None: # ID inexistant chez les entités
-            return None
+        # TRAITEMENT
+
+        _data = res.json()
 
         if _data['_class'] == 'individuals':
             entity = User(id)
         elif _data['_class'] == 'organizations':
             entity = Organization(id)
-        else: 
+        else:
             entity = Entity(id)
 
         entity._load(_data, self.url, self.default_headers)
@@ -82,12 +99,37 @@ class EntityInterface(Interface):
         else:
             return
 
-        self._put_in_db(
-            f"/new_model/{_class}?id={urllib.parse.quote(id)}&name={urllib.parse.quote(name)}&position={urllib.parse.quote(position)}&zone={urllib.parse.quote(zone)}",
+        res = requests.put(
+            f"{self.url}/new_model/{_class}?id={id}&name={name}&position={position}&zone={zone}",
             headers = self.default_headers,
-            use_PUT = True
+            json = {}
         )
 
+
+        # ERREURS
+
+        if 500 <= res.status_code < 600:
+            raise errors.globals.ServerDownError()
+
+        _data = res.json()
+
+        if res.status_code == 400:
+            if _data['message'] == "MissingParam":
+                raise errors.globals.MissingParamError(f"Missing parameter '{_data['param']}'.")
+            elif _data['message'] == "InvalidParam":
+                raise errors.globals.InvalidParamError(f"Invalid parameter '{_data['param']}'.")
+            elif _data['message'] == "InvalidToken":
+                raise errors.globals.AuthError("Token is not valid.")
+
+        elif res.status_code == 401:
+            raise errors.globals.AuthError(_data['message'])
+
+        elif res.status_code == 403:
+            raise errors.globals.PermissionError(_data['message'])
+
+
+        # TRAITEMENT
+
         entity = self.get_entity(id)
 
         if _class == "individuals":
@@ -110,10 +152,29 @@ class EntityInterface(Interface):
             L'entité à supprimer
         """
 
-        res = requests.post(f"{entity._url}/delete", headers = self.default_headers,)
+        res = requests.post(f"{entity._url}/delete", headers = self.default_headers)
 
-        if res.status_code != 200:
-            res.raise_for_status()
+        if 200 <= res.status_code < 300:
+            return
+
+        if 500 <= res.status_code < 600:
+            raise errors.globals.ServerDownError()
+
+        _data = res.json()
+
+        if res.status_code == 400:
+            if _data['message'] == "MissingParam":
+                raise errors.globals.MissingParamError(f"Missing parameter '{_data['param']}'.")
+            elif _data['message'] == "InvalidParam":
+                raise errors.globals.InvalidParamError(f"Invalid parameter '{_data['param']}'.")
+            elif _data['message'] == "InvalidToken":
+                raise errors.globals.AuthError("Token is not valid.")
+
+        elif res.status_code == 401:
+            raise errors.globals.AuthError(_data['message'])
+
+        elif res.status_code == 403:
+            raise errors.globals.PermissionError(_data['message'])
 
     def fetch_entities(self, **query: typing.Any) -> list[ Entity | User | Organization ]:
         """
@@ -172,10 +233,35 @@ class EntityInterface(Interface):
         - `.Position`
         """
 
-        _data = self._get_by_ID('positions', id)
+        res = requests.get(f"{self.url}/model/positions/{id}", headers = self.default_headers)
+
+
+        # ERREURS
+
+        if 500 <= res.status_code < 600:
+            raise errors.globals.ServerDownError()
+
+        _data = res.json()
+
+        if res.status_code == 400:
+            if _data['message'] == "MissingParam":
+                raise errors.globals.MissingParamError(f"Missing parameter '{_data['param']}'.")
+            elif _data['message'] == "InvalidParam":
+                raise errors.globals.InvalidParamError(f"Invalid parameter '{_data['param']}'.")
+            elif _data['message'] == "InvalidToken":
+                raise errors.globals.AuthError("Token is not valid.")
+
+        elif res.status_code == 401:
+            raise errors.globals.AuthError(_data['message'])
+
+        elif res.status_code == 403:
+            raise errors.globals.PermissionError(_data['message'])
+
+        elif res.status_code == 404:
+            return
+
 
-        if _data is None:
-            return None
+        # TRAITEMENT
 
         position = Position(id)
         position._load(_data, self.url, self.default_headers)