nsarchive 2.0.0a8__tar.gz → 2.0.0b2__tar.gz

{nsarchive-2.0.0a8 → nsarchive-2.0.0b2}/PKG-INFO

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

{nsarchive-2.0.0a8 → nsarchive-2.0.0b2}/nsarchive/cls/republic.py

@@ -2,22 +2,53 @@ from nsarchive.cls.base import NSID
 
 # Votes
 
+class VoteOption:
+    def __init__(self, id: str, title: str = None, count: int = 0):
+        self.id = id
+        self.title = title if title else id
+        self.count = count
+
 class Vote:
-    def __init__(self, id: str | NSID, title: str, choices: tuple[str]) -> None:
+    def __init__(self, id: str | NSID, title: str) -> None:
         self.id: NSID = NSID(id)
         self.title: str = title
-        self.choices = { choice : 0 for choice in choices }
-        self.author: str = '0'
+        self.choices: list[VoteOption] = []
+        self.author: NSID = NSID("0")
         self.startDate: int = 0
         self.endDate: int = 0
 
+    def by_id(self, id: str) -> VoteOption:
+        for opt in self.choices:
+            if opt.id == id:
+                return opt
+
+    def sorted(self, titles_only: bool = False) -> list[VoteOption] | list[str]:
+        sorted_list: list[VoteOption] = sorted(self.choices, lambda opt : opt.count)
+
+        if titles_only:
+            return [ opt.id for opt in sorted_list ]
+        else:
+            return sorted_list
+
 class Referendum(Vote):
-    def __init__(self, id: str | NSID, title: str) -> None:
-        super().__init__(id, title, ('yes', 'no', 'blank'))
+    def __init__(self, id: NSID, title: str) -> None:
+        super().__init__(id, title)
+
+        self.choices = [
+            VoteOption('yes', 'Oui'),
+            VoteOption('no', 'Non'),
+            VoteOption('blank', 'Pas d\'avis'),
+        ]
 
 class Lawsuit(Vote):
-    def __init__(self, id: str | NSID, title: str) -> None:
-        super().__init__(id, title, ('innocent', 'guilty', 'blank'))
+    def __init__(self, id: NSID, title: str) -> None:
+        super().__init__(id, title)
+
+        self.choices = [
+            VoteOption('guilty', 'Coupable'),
+            VoteOption('innocent', 'Innocent'),
+            VoteOption('blank', 'Pas d\'avis'),
+        ]
 
 
 # Institutions (defs)
@@ -30,21 +61,19 @@ class Official:
             'PRE_REP': 0, # Président de la République
             'MIN': 0, # Différents ministres
             'PRE_AS': 0, # Président de l'Assemblée Nationale
-            'JUDGE': 0, # Juge
             'REPR': 0 # Député
         }
 
         self.contributions: dict = {
-            'project': 0,
-            'approved_project': 0, 
-            'admin_action': 0, 
-            'law_vote': 0
+            'propose_project': 0,
+            'success_project': 0, 
+            'vote_law': 0
         }
 
 class Administration:
     def __init__(self) -> None:
         self.president: Official
-        self.members: list[Official]
+        self.members: list[Official] = []
 
 class Government:
     def __init__(self, president: Official) -> None:
@@ -61,17 +90,17 @@ class Court:
     def __init__(self) -> None:
         self.president: Official
         # On discutera de la mise en place d'un potentiel président. Pour l'instant c'est le Ministre de la Justice
-        self.members: list[Official]
+        self.members: list[Official] = []
 
 class Assembly:
     def __init__(self) -> None:
         self.president: Official
-        self.members: list[Official]
+        self.members: list[Official] = []
 
 class PoliceForces:
     def __init__(self) -> None:
         self.president: Official
-        self.members: list[Official]
+        self.members: list[Official] = []
 
 class State:
     def __init__(self) -> None:

{nsarchive-2.0.0a8 → nsarchive-2.0.0b2}/nsarchive/instances/_entities.py

@@ -139,7 +139,7 @@ class EntityInstance(Instance):
 
                 _data['members'] += [_member]
 
-            self._upload_to_storage('organizations', entity.avatar, f'/avatars/{entity.id}')
+            self._upload_to_storage('organizations', entity.avatar, f'/avatars/{entity.id}', overwrite = True)
         elif type(entity) == User:
             _data['xp'] = entity.xp
             _data['boosts'] = entity.boosts

{nsarchive-2.0.0a8 → nsarchive-2.0.0b2}/nsarchive/instances/_republic.py

@@ -41,22 +41,34 @@ class RepublicInstance(Instance):
         id = NSID(id)
         _data = self._get_by_ID('votes', id)
 
-        if _data is None:
+        if not _data: # Pas dans les votes -> peut-être dans les procès
+            _data = self._get_by_ID('lawsuits', id)
+
+        if not _data: # Le vote n'existe juste pas
             return None
+        elif '_type' not in _data.keys(): # Le vote est un procès
+            _data['_type'] = "lawsuit"
 
         if _data['_type'] == 'vote':
-            vote = Vote(id, _data['title'], tuple(_data['choices'].keys()))
+            vote = Vote(id, _data['title'])
         elif _data['_type'] == 'referendum':
             vote = Referendum(id, _data['title'])
+            vote.choices = []
         elif _data['_type'] == 'lawsuit':
             vote = Lawsuit(id, _data['title'])
+            vote.choices = []
         else:
-            vote = Vote('0', 'Unknown Vote', ())
+            vote = Vote('0', 'Unknown Vote')
+
+        vote.author = _data['author_id']
+        vote.startDate = _data['start_date']
+        vote.endDate = _data['end_date']
 
-        vote.author = _data['author']
-        vote.startDate = _data['startDate']
-        vote.endDate = _data['endDate']
-        vote.choices = _data['choices']
+        for opt in _data['choices']:
+            option = VoteOption(opt["id"], opt["title"])
+            option.count = opt["count"]
+
+            vote.choices.append(option)
 
         return vote
 
@@ -70,14 +82,19 @@ class RepublicInstance(Instance):
                     'referendum' if type(vote) == Referendum else\
                     'lawsuit' if type(vote) == Lawsuit else\
                     'unknown',
+            'id': NSID(vote.id),
             'title': vote.title,
-            'author': NSID(vote.author),
-            'startDate': vote.startDate,
-            'endDate': vote.endDate,
-            'choices': vote.choices
+            'author_id': NSID(vote.author),
+            'start_date': vote.startDate,
+            'end_date': vote.endDate,
+            'choices': [ opt.__dict__ for opt in vote.choices ]
         }
 
-        self._put_in_db('votes', _data)
+        if type(vote) == Lawsuit:
+            del _data['_type']
+            self._put_in_db('lawsuits', _data)
+        else:
+            self._put_in_db('votes', _data)
 
     # Aucune possibilité de supprimer un vote
 
@@ -103,19 +120,19 @@ class RepublicInstance(Instance):
 
         base = 'mandate' if current_mandate else 'archives'
 
-        _contributions = self.fetch(base, {'author': id, '_type': 'contrib'})
-        _mandates = self.fetch(base, {'target': id, '_type': 'election'}) +\
-                    self.fetch(base, {'target': id, '_type': 'promotion'})
+        _contributions = self.fetch(base, author = id, _type = 'contrib')
+        _mandates = self.fetch(base, target = id, _type = 'election') +\
+                    self.fetch(base, target = id, _type = 'promotion')
 
         user = Official(id)
         for mandate in _mandates:
-            if mandate['position'].startswith('MIN'):
-                mandate['position'] = 'MIN'
+            if mandate['details']['position'].startswith('MIN'):
+                mandate['details']['position'] = 'MIN'
 
             try:
-                user.mandates[mandate['position']] += 1
+                user.mandates[mandate['details']['position']] += 1
             except KeyError:
-                user.mandates[mandate['position']] = 1
+                user.mandates[mandate['details']['position']] = 1
 
         for contrib in _contributions:
             try:
@@ -134,14 +151,14 @@ class RepublicInstance(Instance):
         court = Court()
         police_forces = PoliceForces()
 
-        _get_position: list[dict] = lambda pos : self._select_from_db('functions', 'id', pos)['users']
+        _get_position: list[dict] = lambda pos : self._select_from_db('functions', 'id', pos)[0]['users']
 
-        admin.members = [ self.get_official(user['id']) for user in _get_position('ADMIN') ]
-        admin.president = self.get_official('F7DB60DD1C4300A') # happex (remplace Kheops pour l'instant)
+        admin.members = [ self.get_official(user) for user in _get_position('ADMIN') ]
+        admin.president = self.get_official(0xF7DB60DD1C4300A) # happex (remplace Kheops pour l'instant)
 
-        gov.president = self.get_official([0])
+        gov.president = self.get_official(0x0)
 
-        minister = lambda code : self.get_official(_get_position(f'MIN_{code}')[0]['id'])
+        minister = lambda code : self.get_official(_get_position(f'MIN_{code}')[0])
         gov.prime_minister = minister('PRIM')
         gov.economy_minister = minister('ECO')
         gov.inner_minister = minister('INN')
@@ -150,13 +167,13 @@ class RepublicInstance(Instance):
         gov.outer_minister = minister('OUT')
 
         assembly.president = self.get_official(_get_position('PRE_AS')[0])
-        assembly.members = [ self.get_official(user['id']) for user in _get_position('REPR') ]
+        assembly.members = [ self.get_official(user) for user in _get_position('REPR') ]
 
         court.president = gov.justice_minister
-        court.members = [ self.get_official(user['id']) for user in _get_position('JUDGE') ]
+        court.members = [ self.get_official(user) for user in _get_position('JUDGE') ]
 
         police_forces.president = gov.inner_minister
-        police_forces.members = [ self.get_official(user['id']) for user in _get_position('POLICE') ]
+        police_forces.members = [ self.get_official(user) for user in _get_position('POLICE') ]
 
         instits = State()
         instits.administration = admin
@@ -179,20 +196,20 @@ class RepublicInstance(Instance):
 
         get_ids = lambda institution : [ member.id for member in institutions.__getattribute__(institution).members ]
 
-        self._put_in_db('functions', { 'users': get_ids('administration') })
-        self._put_in_db('functions', { 'users': get_ids('assembly') })
-        self._put_in_db('functions', { 'users': get_ids('court') })
-        self._put_in_db('functions', { 'users': get_ids('police') })
+        self._put_in_db('functions', { 'id': 'ADMIN', 'users': get_ids('administration') })
+        self._put_in_db('functions', { 'id': 'REPR', 'users': get_ids('assembly') })
+        self._put_in_db('functions', { 'id': 'JUDGE', 'users': get_ids('court') })
+        self._put_in_db('functions', { 'id': 'POLICE', 'users': get_ids('police') })
 
-        self._put_in_db('functions', { 'users': [ institutions.assembly.president.id ] })
-        self._put_in_db('functions', { 'users': [ institutions.government.president.id ] })
+        self._put_in_db('functions', { 'id': 'PRE_AS', 'users': [ institutions.assembly.president.id ] })
+        self._put_in_db('functions', { 'id': 'PRE_REP', 'users': [ institutions.government.president.id ] })
 
-        self._put_in_db('functions', { 'users': [ institutions.government.prime_minister.id ] })
-        self._put_in_db('functions', { 'users': [ institutions.government.inner_minister.id ] })
-        self._put_in_db('functions', { 'users': [ institutions.government.justice_minister.id ] })
-        self._put_in_db('functions', { 'users': [ institutions.government.economy_minister.id ] })
-        self._put_in_db('functions', { 'users': [ institutions.government.press_minister.id ] })
-        self._put_in_db('functions', { 'users': [ institutions.government.outer_minister.id ] })
+        self._put_in_db('functions', { 'id': 'MIN_PRIM', 'users': [ institutions.government.prime_minister.id ] })
+        self._put_in_db('functions', { 'id': 'MIN_INN', 'users': [ institutions.government.inner_minister.id ] })
+        self._put_in_db('functions', { 'id': 'MIN_JUS', 'users': [ institutions.government.justice_minister.id ] })
+        self._put_in_db('functions', { 'id': 'MIN_ECO', 'users': [ institutions.government.economy_minister.id ] })
+        self._put_in_db('functions', { 'id': 'MIN_AUD', 'users': [ institutions.government.press_minister.id ] })
+        self._put_in_db('functions', { 'id': 'MIN_OUT', 'users': [ institutions.government.outer_minister.id ] })
 
     def new_mandate(self, institutions: State, weeks: int = 4) -> None:
         """
@@ -222,7 +239,7 @@ class RepublicInstance(Instance):
         elif type(archive) == Demotion:
             _data['_type'] = "demotion"
         else:
-            _data['_type'] = "action"
+            _data['_type'] = "unknown"
 
         self._put_in_db('archives', _data)
         self._put_in_db('mandate', _data) # Ajouter les archives à celle du mandat actuel
@@ -246,9 +263,9 @@ class RepublicInstance(Instance):
             return None
 
         if _data['_type'] == "election":
-            archive = Election(_data['author'], _data['target'], _data['position'])
+            archive = Election(_data['author'], _data['target'], _data['details']['position'])
         elif _data['_type'] == "promotion":
-            archive = Promotion(_data['author'], _data['target'], _data['position'])
+            archive = Promotion(_data['author'], _data['target'], _data['details']['position'])
         elif _data['_type'] == "demotion":
             archive = Demotion(_data['author'], _data['target'])
         else:

{nsarchive-2.0.0a8 → nsarchive-2.0.0b2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nsarchive"
-version = "2.0.0-alpha.8"
+version = "2.0.0-beta.2"
 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"