nsarchive 3.0.0a8__tar.gz → 3.0.0b1__tar.gz

{nsarchive-3.0.0a8 → nsarchive-3.0.0b1}/PKG-INFO

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

{nsarchive-3.0.0a8 → nsarchive-3.0.0b1}/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.1
+Date de sortie: 2025-08-06
 License: GPL-3.0
 Auteur : happex <110610727+okayhappex@users.noreply.github.com>
 
@@ -22,6 +22,8 @@ from .models.republic import *
 from .models.state import *
 from .models.justice import *
 
+from .models.scale import *
+
 # Import des interfaces
 from .models.base import Interface
 from .interfaces._entities import EntityInterface

{nsarchive-3.0.0a8 → nsarchive-3.0.0b1}/nsarchive/interfaces/_entities.py

@@ -83,7 +83,7 @@ class EntityInterface(Interface):
             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)}",
+            f"/new_model/{_class}?id={id}&name={name}&position={position}&zone={zone}",
             headers = self.default_headers,
             use_PUT = True
         )
@@ -110,7 +110,7 @@ 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()

nsarchive-3.0.0b1/nsarchive/interfaces/_justice.py

@@ -0,0 +1,122 @@
+import requests
+import time
+
+from ..models.base import *
+from ..models.justice import *
+
+class JusticeInterface(Interface):
+    """
+    Gère les procès, sanctions et signalements.
+    """
+
+    def __init__(self, url: str, token: str) -> None:
+        super().__init__(url, token)
+
+    """
+    SIGNALEMENTS
+    """
+
+    def get_report(self, id: NSID) -> Report:
+        res = requests.get(
+            f"{self.url}/justice/reports/{id}",
+            headers = self.default_headers,
+        )
+
+        if res.status_code != 200:
+            res.raise_for_status()
+
+        report = Report(id)
+        report._load(res.json(), f"{self.url}/justice/reports/{id}", self.default_headers)
+
+        return report
+
+    def submit_report(self, target: NSID, reason: str = None, details: str = None) -> Report:
+        payload = {}
+        if reason: payload['reason'] = reason
+        if details: payload['details'] = details
+
+        res = requests.put(
+            f"{self.url}/justice/submit_report?target={target}",
+            headers = self.default_headers,
+            json = payload
+        )
+
+        if res.status_code != 200:
+            res.raise_for_status()
+
+        report = Report(NSID(res.json()['id']))
+        report._load(res.json(), f"{self.url}/justice/reports/{report.id}", self.default_headers)
+
+        return report
+
+    """
+    PROCÈS
+    """
+
+    def get_lawsuit(self, id: NSID) -> Lawsuit:
+        res = requests.get(
+            f"{self.url}/justice/lawsuits/{id}",
+            headers = self.default_headers,
+        )
+
+        if res.status_code != 200:
+            res.raise_for_status()
+
+        lawsuit = Lawsuit(id)
+        lawsuit._load(res.json(), f"{self.url}/justice/lawsuits/{id}", self.default_headers)
+
+        return lawsuit
+
+    def open_lawsuit(self, target: NSID, title: str = None, report: Report = None) -> Lawsuit:
+        payload = {}
+        if title: payload['title'] = title
+
+        res = requests.put(
+            f"{self.url}/justice/open_lawsuit?target={target}{('&report=' + report.id) if report else ''}",
+            headers = self.default_headers,
+            json = payload
+        )
+
+        if res.status_code != 200:
+            res.raise_for_status()
+
+        lawsuit = Lawsuit(NSID(res.json()['id']))
+        lawsuit._load(res.json(), f"{self.url}/justice/lawsuits/{report.id}", self.default_headers)
+
+        return lawsuit
+
+    """
+    SANCTIONS
+    """
+
+    def get_sanction(self, id: NSID) -> Sanction:
+        res = requests.get(
+            f"{self.url}/justice/sanctions/{id}",
+            headers = self.default_headers,
+        )
+
+        if res.status_code != 200:
+            res.raise_for_status()
+
+        sanction = Sanction(id)
+        sanction._load(res.json(), f"{self.url}/justice/sanctions/{id}", self.default_headers)
+
+        return sanction
+
+    def add_sanction(self, target: NSID, _type: str, duration: int = None, title: str = None, lawsuit: Lawsuit = None) -> Sanction:
+        payload = {}
+        if title: payload['title'] = title
+
+        res = requests.put(
+            f"{self.url}/justice/add_sanction?type={_type}&target={target}&date={str(round(time.time()))}{('&duration=' + str(duration)) if duration else ''}{('&case=' + lawsuit.id) if lawsuit else ''}",
+            headers = self.default_headers,
+            json = payload
+        )
+
+        if res.status_code != 200:
+            res.raise_for_status()
+
+        sanction = Sanction(NSID(res.json()['id']))
+        sanction._load(res.json(), f"{self.url}/justice/sanctions/{sanction.id}", self.default_headers)
+
+        return sanction

{nsarchive-3.0.0a8 → nsarchive-3.0.0b1}/nsarchive/interfaces/_state.py

@@ -43,7 +43,7 @@ class StateInterface(Interface):
 
         _data = res.json()
 
-        vote = Vote(id, _data['title'])
+        vote = Vote(id)
         vote._load(_data, url = f"{self.url}/votes/{id}", headers = self.default_headers)
 
         return vote
@@ -69,18 +69,70 @@ class StateInterface(Interface):
         if title:
             payload['title'] = title
 
-        res = requests.put(f"{self.url}/open_vote", headers = self.default_headers, json = _data)
+        res = requests.put(f"{self.url}/open_vote", headers = self.default_headers, json = payload)
 
         if res.status_code == 200:
             _data = res.json()
 
-            vote = Vote()
+            vote = Vote(_data['id'])
             vote._load(_data, url = f"{self.url}/votes/{_data['id']}", headers = self.default_headers)
+
+            return vote
         else:
             res.raise_for_status()
 
     # Aucune possibilité de supprimer un vote
 
+    def get_election(self, id: NSID) -> Election:
+        """
+        Récupère une élection.
+
+        ## Paramètres
+        id: `NSID`\n
+            ID de l'élection.
+
+        ## Renvoie
+        - `.Election`
+        """
+
+        id = NSID(id)
+        res = requests.get(f"{self.url}/elections/{id}", headers = self.default_headers)
+
+        if res.status_code != 200:
+            res.raise_for_status()
+
+        _data = res.json()
+
+        election = Election(id)
+        election._load(_data, url = f"{self.url}/elections/{id}", headers = self.default_headers)
+
+        return election
+
+    def open_election(self, vote: Vote, start: int = None, full: bool = False) -> Election:
+        """
+        Déclenche une élection dans la base de données.
+
+        ## Paramètres
+        - vote: `.Vote`\n
+            Vote associé
+        - start: `int` (optionnel)\n
+            Date de début du vote (timestamp, dure 4 jours)
+        - full: `bool` (optionnel)\n
+            Choix du type d'élections (True = présidentielles, False = législatives)
+        """
+
+        res = requests.put(f"{self.url}/open_election?vote={vote.id}&type={'full' if full else 'partial'}{('&date=' + str(start)) if start else ''}", headers = self.default_headers, json = {})
+
+        if res.status_code == 200:
+            _data = res.json()
+
+            election = Election(_data['id'])
+            election._load(_data, url = f"{self.url}/elections/{_data['id']}", headers = self.default_headers)
+
+            return election
+        else:
+            res.raise_for_status()
+
     """
     PARTIS
     """
@@ -100,8 +152,8 @@ class StateInterface(Interface):
         id = NSID(id)
         res = requests.get(f"{self.url}/parties/{id}", headers = self.default_headers)
 
-        if not res:
-            return None
+        if res.status_code != 200:
+            res.raise_for_status()
 
         _data = res.json()
 
@@ -128,15 +180,17 @@ class StateInterface(Interface):
         payload = {
             "color": color,
             "motto": motto,
-            "scale": scale
+            "scale": scale if isinstance(scale, dict) else scale._to_dict()
         }
 
-        res = requests.put(f"{self.url}/register_party?candidate={id}", headers = self.default_headers, json = _data)
+        res = requests.put(f"{self.url}/register_party?candidate={id}", headers = self.default_headers, json = payload)
 
         if res.status_code == 200:
             _data = res.json()
 
-            vote = Vote()
-            vote._load(_data, url = f"{self.url}/votes/{_data['id']}", headers = self.default_headers)
+            party = Party(_data['org_id'])
+            party._load(_data, url = f"{self.url}/parties/{_data['org_id']}", headers = self.default_headers)
+
+            return party
         else:
             res.raise_for_status()

{nsarchive-3.0.0a8 → nsarchive-3.0.0b1}/nsarchive/models/base.py

@@ -57,6 +57,10 @@ class Interface:
             "Content-Type": "application/json",
         }
 
+        return
+
+        # Vérification (ralentit considérablement les requêtes)*
+
         try:
             test_res = requests.get(f'{self.url}/ping')
 
@@ -138,7 +142,7 @@ class Interface:
 
         return _data
 
-    def _put_in_db(self, endpoint: str, body: dict, headers: dict = None, use_PUT: bool = False) -> None:
+    def _put_in_db(self, endpoint: str, body: dict = {}, headers: dict = None, use_PUT: bool = False) -> None:
         """
         Publie des données JSON dans une table nation-db.
 
@@ -162,7 +166,6 @@ class Interface:
         if 200 <= res.status_code < 300:
             return res.json()
         else:
-            print(res.text)
             res.raise_for_status()
 
     def _delete(self, _class: str, ids: list[NSID]) -> None:

{nsarchive-3.0.0a8 → nsarchive-3.0.0b1}/nsarchive/models/economy.py

@@ -65,7 +65,6 @@ class BankAccount:
         if res.status_code == 200:
             self.frozen = frozen
         else:
-            print(res.text)
             res.raise_for_status()
 
     def flag(self, flagged: bool = True, reason: str = None) -> None:

{nsarchive-3.0.0a8 → nsarchive-3.0.0b1}/nsarchive/models/entities.py

@@ -10,10 +10,10 @@ from .. import utils
 
 class Permission:
     def __init__(self, initial: str = "----"):
-        self.append: bool
-        self.manage: bool
-        self.edit: bool
-        self.read: bool
+        self.append: bool = False
+        self.manage: bool = False
+        self.edit: bool = False
+        self.read: bool = False
 
         self.load(initial)
 
@@ -195,7 +195,6 @@ class Entity:
         if res.status_code == 200:
             self.additional[key] = value
         else:
-            print(res.text)
             res.raise_for_status()
 
     def unlink(self, key: str) -> None:

{nsarchive-3.0.0a8 → nsarchive-3.0.0b1}/nsarchive/models/justice.py

@@ -60,7 +60,7 @@ class Sanction:
         self.date: int = round(time.time())
         self.duration: int = 0
         self.title: str = None
-        self.case: NSID = NSID('0')
+        self.lawsuit: NSID = NSID('0')
 
     def _load(self, _data: dict, url: str, headers: dict) -> None:
         self._url = url
@@ -72,7 +72,7 @@ class Sanction:
         self.date = _data['date']
         self.duration = _data['duration']
         self.title = _data['title']
-        self.case = NSID(_data['case'])
+        self.lawsuit = NSID(_data['lawsuit'])
 
 class Lawsuit:
     def __init__(self, id: NSID):

{nsarchive-3.0.0a8 → nsarchive-3.0.0b1}/nsarchive/models/republic.py

@@ -1,3 +1,4 @@
+import json
 import requests
 import time
 
@@ -18,10 +19,19 @@ class VoteOption:
         Nombre de sympathisants pour cette option
     """
 
-    def __init__(self, id: str, title: str = None, count: int = 0):
-        self.id = id
-        self.title = title if title else id
-        self.count = count
+    def __init__(self, title: str, count: int = 0):
+        self.title: str = title
+        self.count: int = count
+
+    def __repr__(self) -> dict:
+        return json.dumps({
+            'title': self.title,
+            'count': self.count
+        })
+
+    def _load(self, _data: dict):
+        self.title = str(_data['title'])
+        self.count = int(_data['count'])
 
 class Vote:
     """
@@ -32,7 +42,7 @@ class Vote:
         Identifiant du vote
     - title: `str`\n
         Titre du vote
-    - options: list[.VoteOption]\n
+    - options: dict[str, .VoteOption]\n
         Liste des choix disponibles
     - author: `NSID`\n
         Identifiant de l'auteur du vote
@@ -53,31 +63,29 @@ class Vote:
         self.startDate: int = round(time.time())
         self.endDate: int = 0
 
-        self.options: list[VoteOption] = []
+        self.options: dict[str, VoteOption] = {}
 
     def _load(self, _data: dict, url: str, headers: dict) -> None:
-        self._url = url + '/votes/' + _data['id']
+        self._url = url
         self._headers = headers
 
         self.id = NSID(_data['id'])
         self.title = _data['title']
-        self.author = _data['author_id']
+        self.author = _data['author']
 
-        self.startDate = _data['start_date']
-        self.endDate = _data['end_date']
+        self.startDate = _data['start']
+        self.endDate = _data['end']
 
-        self.options = []
+        self.options = {}
 
-        for opt in _data['options']:
-            option = VoteOption(opt["id"], opt["title"])
-            option.count = opt["count"]
+        for _opt_id, opt in _data['options'].items():
+            option = VoteOption(*tuple(opt.values()))
 
-            self.options.append(option)
+            self.options[_opt_id] = option
 
     def get(self, id: str) -> VoteOption:
-        for opt in self.options:
-            if opt.id == id:
-                return opt
+        if id in self.options.keys():
+            return self.options[id]
         else:
             raise ValueError(f"Option {id} not found in vote {self.id}")
 
@@ -86,15 +94,10 @@ class Vote:
         Ajoute un vote à l'option spécifiée
         """
 
-        res = requests.post(f"{self._url}/vote?choice={id}", headers = self._headers)
+        res = requests.post(f"{self._url}/vote?option={id}", headers = self._headers)
 
         if res.status_code == 200:
-            for opt in self.options:
-                if opt.id == id:
-                    opt.count += 1
-                    break
-            else:
-                raise ValueError(f"Option {id} not found in vote {self.id}")
+            self.get(id).count += 1
         else:
             res.raise_for_status()
 

{nsarchive-3.0.0a8 → nsarchive-3.0.0b1}/nsarchive/models/state.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import requests
 
 from .base import NSID
@@ -13,7 +15,7 @@ class Party:
         self.color: int = 0x000000
         self.motto: str = None
         self.scale: dict = {}
-        self.last_elected: int = None
+        self.last_election: int = None
 
     def _load(self, _data: dict, url: str = None, headers: dict = None):
         self._url = url
@@ -24,7 +26,10 @@ class Party:
         self.color = _data['color']
         self.motto = _data['motto']
         self.scale = _data['politiscales']
-        self.last_elected = _data['last_elected']
+        self.last_election = _data['last_election']
+
+    def cancel_candidacy(self, election: Election):
+        election.cancel_candidacy()
 
 class Election:
     def __init__(self, id: NSID):
@@ -35,17 +40,28 @@ class Election:
         self.type: str = 'full' # Partial = législatives, full = totales
         self.vote: Vote = None
 
-        self.add_vote = self.vote.add_vote
-        self.close = self.vote.close
-
     def _load(self, _data: dict, url: str = None, headers: str = None):
         self._url = url
         self._headers = headers
 
         self.id = _data['id']
         self.type = _data['type']
+
+        self.vote = Vote(_data['vote']['id'])
         self.vote._load(_data['vote'], url, headers)
 
+    def close(self):
+        if self.vote:
+            self.vote.close()
+        else:
+            return
+
+    def add_vote(self, id: str):
+        if self.vote:
+            self.vote.add_vote(id)
+        else:
+            return
+
     def submit_candidacy(self):
         res = requests.put(f"{self._url}/submit")
 

{nsarchive-3.0.0a8 → nsarchive-3.0.0b1}/pyproject.toml

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

nsarchive-3.0.0a8/nsarchive/interfaces/_justice.py

@@ -1,50 +0,0 @@
-import requests
-import time
-
-from ..models.base import *
-from ..models.justice import *
-
-class JusticeInterface(Interface):
-    """
-    Gère les procès, sanctions et signalements.
-    """
-
-    def __init__(self, url: str, token: str) -> None:
-        super().__init__(url, token)
-
-    """
-    SIGNALEMENTS
-    """
-
-    def get_report(self, id: NSID) -> Report:
-        res = requests.get(
-            f"{self.url}/justice/reports/{id}",
-            headers = self.default_headers,
-        )
-
-        if res.status_code != 200:
-            res.raise_for_status()
-
-        report = Report(id)
-        report._load(res.json(), f"{self.url}/justice/reports/{id}", self.default_headers)
-
-        return report
-
-    def submit_report(self, target: NSID, reason: str = None, details: str = None) -> Report:
-        payload = {}
-        if reason: payload['reason'] = reason
-        if details: payload['details'] = details
-
-        res = requests.put(
-            f"{self.url}/justice/submit_report?target={target}",
-            headers = self.default_headers,
-            json = payload
-        )
-
-        if res.status_code != 200:
-            res.raise_for_status()
-
-        report = Report(NSID(res.json()['id']))
-        report._load(res.json(), f"{self.url}/justice/reports/{report.id}", self.default_headers)
-
-        return report