nsarchive 2.0.0a7__py3-none-any.whl → 2.0.0a8__py3-none-any.whl

nsarchive/cls/base.py

@@ -1,3 +1,4 @@
+import json
 import typing
 
 from supabase import Client
@@ -37,7 +38,7 @@ class Instance:
     def __init__(self, client: Client):
         self.db = client
 
-    def _select_from_db(self, table: str, key: str, value: str) -> list:
+    def _select_from_db(self, table: str, key: str = None, value: str = None) -> list:
         """
         Récupère des données JSON d'une table Supabase en fonction de l'ID.
 
@@ -54,7 +55,10 @@ class Instance:
         - `None` si aucune donnée n'est trouvée
         """
 
-        res = self.db.from_(table).select("*").eq(key, value).execute()
+        if key and value:
+            res = self.db.from_(table).select("*").eq(key, value).execute()
+        else:
+            res = self.db.from_(table).select("*").execute()
 
         if res.data:
             return res.data
@@ -117,9 +121,59 @@ class Instance:
             if entity is not None:
                 matches.append(entity)
 
-        if not matches or len(matches) != len(query):
+        if query == {}:
+            matches = [ self._select_from_db(table) ]
+
+        if not matches or (len(matches) != len(query) and query != {}):
             return []
 
         _res = [ item for item in matches[0] if all(item in match for match in matches[1:]) ]
 
         return _res
+
+    def _upload_to_storage(self, bucket: str, data: bytes, path: str, overwrite: bool = False, options: dict = {'content-type': 'image/png'}) -> dict:
+        """
+        Envoie un fichier dans un bucket Supabase.
+
+        ## Paramètres
+        bucket: `str`\n
+            Nom du bucket où le fichier sera stocké
+        data: `bytes`\n
+            Données à uploader
+        path: `str`\n
+            Chemin dans le bucket où le fichier sera stocké
+
+        ## Renvoie
+        - `dict` contenant les informations de l'upload si réussi
+        - `None` en cas d'échec
+        """
+
+        options["upsert"] = json.dumps(overwrite)
+
+        if len(data) > 5 * 1000 ** 3:
+            raise ValueError("La limite d'un fichier à upload est de 1Mo")
+
+        res = self.db.storage.from_(bucket).upload(path, data, options)
+
+        if res.json().get("error"):
+            print("Erreur lors de l'upload:", res["error"])
+
+        return res
+
+    def _download_from_storage(self, bucket: str, path: str) -> bytes:
+        """
+        Télécharge un fichier depuis le stockage Supabase.
+
+        ## Paramètres
+        bucket: `str`\n
+            Nom du bucket où il faut chercher le fichier 
+        path: `str`\n
+            Chemin du fichier dans le bucket
+
+        ## Renvoie
+        - Le fichier demandé en `bytes`
+        """
+
+        res = self.db.storage.from_(bucket).download(path)
+
+        return res

nsarchive/cls/entities.py

@@ -3,7 +3,7 @@ import time
 from .exceptions import *
 from .base import NSID
 
-from ..utils import assets
+from .. import utils
 
 class PositionPermissions:
     """
@@ -38,6 +38,9 @@ class Position:
         self.id = id
         self.permissions: PositionPermissions = PositionPermissions()
 
+    def __repr__(self):
+        return self.id
+
 class Entity:
     def __init__(self, id: str | NSID) -> None:
         self.id: NSID = NSID(id) # ID hexadécimal de l'entité (ou nom dans le cas de l'entreprise)
@@ -52,7 +55,7 @@ class Entity:
 
         self.name = new_name
 
-    def set_position(self, position: str) -> None:
+    def set_position(self, position: Position) -> None:
         self.position = position
 
     def add_link(self, key: str, value: str | int) -> None:
@@ -135,7 +138,7 @@ class Organization(Entity):
         super().__init__(NSID(id))
 
         self.owner: Entity
-        self.avatar: bytes = assets.open('default_avatar.png')
+        self.avatar: bytes = utils.open_asset('default_avatar.png')
 
         self.certifications: dict = {}
         self.members: list[GroupMember] = []

nsarchive/instances/_entities.py

@@ -85,11 +85,12 @@ class EntityInstance(Instance):
 
             entity.certifications = _data['certifications']
             entity.parts = _data['parts']
+            entity.avatar = self._download_from_storage('organizations', f"avatars/{entity.id}")
         else:
             entity = Entity(id)
 
         entity.name = _data['name']
-        entity.position = _data['position'] # Métier si c'est un utilisateur, domaine professionnel si c'est un collectif
+        entity.position = self.get_position(_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():
@@ -114,7 +115,7 @@ class EntityInstance(Instance):
         _data = {
             'id': entity.id,
             'name': entity.name,
-            'position': entity.position,
+            'position': entity.position.id,
             'register_date': entity.registerDate,
             'additional': {},
         }
@@ -136,7 +137,9 @@ class EntityInstance(Instance):
                     'position': member.permission_level
                 }
 
-                _data['members'] += [_member]                
+                _data['members'] += [_member]
+
+            self._upload_to_storage('organizations', entity.avatar, f'/avatars/{entity.id}')
         elif type(entity) == User:
             _data['xp'] = entity.xp
             _data['boosts'] = entity.boosts
@@ -155,7 +158,7 @@ class EntityInstance(Instance):
 
         self._delete_by_ID('individuals' if isinstance(entity, User) else 'organizations', NSID(entity.id))
 
-    def fetch_entities(self, **query: dict) -> list[ Entity | User | Organization ]:
+    def fetch_entities(self, **query: typing.Any) -> list[ Entity | User | Organization ]:
         """
         Récupère une liste d'entités en fonction d'une requête.
 
@@ -198,7 +201,6 @@ class EntityInstance(Instance):
 
         id = NSID(id)
         groups = self.fetch_entities(_type = 'organization')
-        groups.extend(self.fetch_entities(_type = 'organization', owner_id = id))
 
         for group in groups:
             if group is None:

nsarchive/utils.py

@@ -0,0 +1,26 @@
+import io
+import math
+import os
+from PIL import Image
+
+def open_asset(path: str) -> bytes:
+    curr_dir = os.path.dirname(os.path.abspath(os.path.join(__file__)))
+    asset_path = os.path.join(curr_dir, 'assets', path)
+
+    image = Image.open(asset_path)
+    val = io.BytesIO()
+
+    image.save(val, format = 'PNG')
+
+    return val.getvalue()
+
+def compress_image(data: bytes, _max: int = 1000 ** 2) -> bytes:
+    img = Image.open(io.BytesIO(data))
+    size = 2 * ( math.floor(math.sqrt(_max),) )
+
+    img.resize(size)
+
+    val = io.BytesIO()
+    img.save(val)
+
+    return val.getvalue()

{nsarchive-2.0.0a7.dist-info → nsarchive-2.0.0a8.dist-info}/METADATA

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

{nsarchive-2.0.0a7.dist-info → nsarchive-2.0.0a8.dist-info}/RECORD

@@ -1,16 +1,16 @@
 nsarchive/__init__.py,sha256=_hwIocDyD7R-4rS7ypca8jZex93H6mK-b9NpTpt-Rvo,724
 nsarchive/assets/default_avatar.png,sha256=n-4vG_WPke8LvbY3ZU6oA-H-OtRoIu7woKnRq9DCIlI,51764
 nsarchive/cls/archives.py,sha256=HHQhGKdnl7vD5zC8-bbXeQLhp8A98bBlneJTkztOmMg,2007
-nsarchive/cls/base.py,sha256=RWcpUDfo96BjsUR_G49c9mR80qZKGKD82RoZB2do1p8,3606
+nsarchive/cls/base.py,sha256=7MXIsvJdBoWqUPcsQI22EFIx0pJKcx78WFOD1TrPbgg,5306
 nsarchive/cls/economy.py,sha256=fnzmliHsUBEdu5RrrSkimpcgou_HFnivP_lmzLKCaDI,1360
-nsarchive/cls/entities.py,sha256=hjqCtsQHQZrLFwR57d_n4FssJ53-jdniQMHUAJGuDPY,6612
+nsarchive/cls/entities.py,sha256=hY4_cO-LtH69NMm8lK_INU8-qGmM5Qzmm0md3bNvoyU,6667
 nsarchive/cls/exceptions.py,sha256=QN6Qn7cxTkGoC4lO50hBAq4gZCgo7scQvCkb-xKl6Xs,692
 nsarchive/cls/republic.py,sha256=4amjvCS5BnrvEgbjjDx_tOit3TbOSCMTsns6ifceL_8,2464
 nsarchive/instances/_economy.py,sha256=7p1Ofu17hhuN2RWVWxwA28EDlMP8sAueT3bCOVlvRsY,7444
-nsarchive/instances/_entities.py,sha256=zu0ZaKXKCEFv6DNQiRkk13CufHyEYAi3Bx9LaYJ6tkc,10346
+nsarchive/instances/_entities.py,sha256=zWgaPH-ITCXHuGv1Ua4UNN1cui-_pv8ZMwRuygOHwlA,10469
 nsarchive/instances/_republic.py,sha256=5-6XjPWNcR8sHxm1ipWlQXUIi-UKmfo2OHir9QSQvWM,10106
-nsarchive/utils/assets.py,sha256=WGC03K1VZ5LwGzcVXbqphtGBZ_Vjso-1hmbIkpgL_X8,382
-nsarchive-2.0.0a7.dist-info/LICENSE,sha256=aFLFZg6LEJFpTlNQ8su3__jw4GfV-xWBmC1cePkKZVw,35802
-nsarchive-2.0.0a7.dist-info/METADATA,sha256=wysDMQVOMEo3d23n2HkSAyd8DFUmHjd36DKow8REQF8,5697
-nsarchive-2.0.0a7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-nsarchive-2.0.0a7.dist-info/RECORD,,
+nsarchive/utils.py,sha256=qpQCZLlbVApOLtCI2ml54QwUld6K8fDxyBfwzofqXzw,610
+nsarchive-2.0.0a8.dist-info/LICENSE,sha256=aFLFZg6LEJFpTlNQ8su3__jw4GfV-xWBmC1cePkKZVw,35802
+nsarchive-2.0.0a8.dist-info/METADATA,sha256=ym4eE13jW1PAY7tUAccqVPcDvwgJi-J-s89e4NXTeQk,5697
+nsarchive-2.0.0a8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+nsarchive-2.0.0a8.dist-info/RECORD,,

nsarchive/utils/assets.py

@@ -1,15 +0,0 @@
-import io
-import os
-from PIL import Image
-
-def open(path: str) -> bytes:
-    curr_dir = os.path.dirname(os.path.abspath(os.path.join(__file__)))
-    parent_dir = os.path.dirname(curr_dir)
-    asset_path = os.path.join(parent_dir, 'assets', path)
-
-    image = Image.open(asset_path)
-    val = io.BytesIO()
-
-    image.save(val, format = 'PNG')
-
-    return val.getvalue()