mmisp-lib 0.7.2__tar.gz → 0.7.4__tar.gz

{mmisp_lib-0.7.2 → mmisp_lib-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mmisp-lib
-Version: 0.7.2
+Version: 0.7.4
 Requires-Python: >=3.11.0
 Description-Content-Type: text/markdown
 License-File: LICENSE

{mmisp_lib-0.7.2 → mmisp_lib-0.7.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mmisp-lib"
-version = "0.7.2"
+version = "0.7.4"
 description = ""
 authors = []
 readme = "README.md"

{mmisp_lib-0.7.2 → mmisp_lib-0.7.4}/src/mmisp/api_schemas/galaxy_clusters.py

@@ -1,7 +1,7 @@
 from datetime import datetime
+from uuid import UUID
 
 from pydantic import BaseModel
-from pydantic.types import UUID4
 
 from mmisp.api_schemas.events import AddEditGetEventGalaxyClusterRelation, GetAllEventsGalaxyClusterGalaxy
 from mmisp.api_schemas.galaxy_common import GetAllSearchGalaxiesAttributes
@@ -18,7 +18,7 @@ class ExportGalaxyGalaxyElement(BaseModel):
 
 class GetGalaxyClusterResponse(BaseModel):
     id: int | None = None
-    uuid: UUID4 | None = None
+    uuid: UUID | None = None
     collection_uuid: str
     type: str
     value: str
@@ -108,7 +108,7 @@ class PutGalaxyClusterRequest(BaseModel):
     description: str
     source: str
     type: str
-    uuid: UUID4
+    uuid: UUID
     version: int
     authors: list[str]
     distribution: DistributionLevels

{mmisp_lib-0.7.2 → mmisp_lib-0.7.4}/src/mmisp/db/config.py

@@ -1,3 +1,14 @@
+"""This module handels the parameters to connect to the database.
+
+The following environment variables are supported:
+
+- DATABASE_URL
+- DEBUG
+- DB_RETRY: Time to wait before trying new connection attempt. (Default 5)
+- DB_MAX_RETRIES: Limit for retry attempts. (Default 100)
+
+"""
+
 import logging
 from dataclasses import dataclass
 from os import getenv

{mmisp_lib-0.7.2 → mmisp_lib-0.7.4}/src/mmisp/db/mixins.py

@@ -6,6 +6,15 @@ from sqlalchemy.ext.hybrid import hybrid_property
 
 class DictMixin:
     def asdict(self: Self, omit: set[str] | None = None) -> dict:
+        """
+        Return the object as dictionary.
+        Note that attributes starting with `_` are always omited.
+        Omit keys present in *omit*.
+
+        Args:
+            omit: Set of keys to be omitted in the dictionary.
+                If none, all attributes are returned.
+        """
         if omit is None:
             omit = set()
 

{mmisp_lib-0.7.2 → mmisp_lib-0.7.4}/src/mmisp/tests/fixtures.py

@@ -135,6 +135,8 @@ async def instance_two_owner_org(db):
 
 @pytest_asyncio.fixture
 async def site_admin_user(db, site_admin_role, instance_owner_org):
+    assert instance_owner_org.local
+
     user = generate_user()
     user.org_id = instance_owner_org.id
     user.server_id = 0

{mmisp_lib-0.7.2 → mmisp_lib-0.7.4}/src/mmisp/workflows/execution.py

@@ -8,6 +8,7 @@ import sqlalchemy as sa
 from jinja2 import BaseLoader, Environment
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
+from sqlalchemy.sql.expression import true
 
 from ..db.models.admin_setting import AdminSetting
 from ..db.models.organisation import Organisation
@@ -109,10 +110,10 @@ async def walk_nodes(
 
 async def create_virtual_root_user(db: AsyncSession) -> User:
     god_mode_role_id = (await db.execute(select(Role.id).filter(Role.perm_site_admin == 1))).scalars().first()
-    local_org_id = (await db.execute(select(Organisation.id).filter(Organisation.local))).scalars().first()
-    if not god_mode_role_id:
+    local_org_id = (await db.execute(select(Organisation.id).filter(Organisation.local == true()))).scalars().first()
+    if god_mode_role_id is None:
         raise ValueError("No site admin role found")
-    if not local_org_id:
+    if local_org_id is None:
         raise ValueError("No local_org_id found")
 
     return User(

{mmisp_lib-0.7.2 → mmisp_lib-0.7.4}/src/mmisp_lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mmisp-lib
-Version: 0.7.2
+Version: 0.7.4
 Requires-Python: >=3.11.0
 Description-Content-Type: text/markdown
 License-File: LICENSE