diracx-db 0.0.1a42__tar.gz → 0.0.1a44__tar.gz

{diracx_db-0.0.1a42 → diracx_db-0.0.1a44}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diracx-db
-Version: 0.0.1a42
+Version: 0.0.1a44
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research
@@ -14,5 +14,6 @@ Requires-Dist: diracx-core
 Requires-Dist: opensearch-py[async]
 Requires-Dist: pydantic>=2.10
 Requires-Dist: sqlalchemy[aiomysql,aiosqlite]>=2
+Requires-Dist: uuid-utils
 Provides-Extra: testing
 Requires-Dist: diracx-testing; extra == "testing"

{diracx_db-0.0.1a42 → diracx_db-0.0.1a44}/pyproject.toml

@@ -17,6 +17,7 @@ dependencies = [
     "opensearch-py[async]",
     "pydantic >=2.10",
     "sqlalchemy[aiomysql,aiosqlite] >= 2",
+    "uuid-utils",
 ]
 dynamic = ["version"]
 

{diracx_db-0.0.1a42 → diracx_db-0.0.1a44}/src/diracx/db/os/job_parameters.py

@@ -25,7 +25,8 @@ class JobParametersDB(BaseOSDB):
 
     def index_name(self, vo, doc_id: int) -> str:
         split = int(int(doc_id) // 1e6)
-        return f"{self.index_prefix}_{vo}_{split}m"
+        # The index name must be lowercase or opensearchpy will throw.
+        return f"{self.index_prefix}_{vo.lower()}_{split}m"
 
     def upsert(self, vo, doc_id, document):
         document = {

{diracx_db-0.0.1a42 → diracx_db-0.0.1a44}/src/diracx/db/sql/auth/db.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
 import secrets
-from uuid import UUID, uuid4
 
 from sqlalchemy import insert, select, update
 from sqlalchemy.exc import IntegrityError, NoResultFound
+from uuid_utils import UUID, uuid7
 
 from diracx.core.exceptions import (
     AuthorizationError,
@@ -126,7 +126,7 @@ class AuthDB(BaseSQLDB):
         code_challenge_method: str,
         redirect_uri: str,
     ) -> str:
-        uuid = str(uuid4())
+        uuid = str(uuid7())
 
         stmt = insert(AuthorizationFlows).values(
             uuid=uuid,
@@ -199,7 +199,6 @@ class AuthDB(BaseSQLDB):
         self,
         jti: UUID,
         subject: str,
-        preferred_username: str,
         scope: str,
     ) -> None:
         """Insert a refresh token in the DB as well as user attributes
@@ -209,7 +208,6 @@ class AuthDB(BaseSQLDB):
         stmt = insert(RefreshTokens).values(
             jti=str(jti),
             sub=subject,
-            preferred_username=preferred_username,
             scope=scope,
         )
         await self.conn.execute(stmt)

{diracx_db-0.0.1a42 → diracx_db-0.0.1a44}/src/diracx/db/sql/auth/schema.py

@@ -97,6 +97,5 @@ class RefreshTokens(Base):
 
     # User attributes bound to the refresh token
     sub = Column("Sub", String(256), index=True)
-    preferred_username = Column("PreferredUsername", String(255))
 
     __table_args__ = (Index("index_status_sub", status, sub),)

{diracx_db-0.0.1a42 → diracx_db-0.0.1a44}/src/diracx/db/sql/dummy/db.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
-from uuid import UUID
-
 from sqlalchemy import func, insert, select
+from uuid_utils import UUID
 
 from diracx.db.sql.utils import BaseSQLDB, apply_search_filters
 

{diracx_db-0.0.1a42 → diracx_db-0.0.1a44}/src/diracx_db.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diracx-db
-Version: 0.0.1a42
+Version: 0.0.1a44
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research
@@ -14,5 +14,6 @@ Requires-Dist: diracx-core
 Requires-Dist: opensearch-py[async]
 Requires-Dist: pydantic>=2.10
 Requires-Dist: sqlalchemy[aiomysql,aiosqlite]>=2
+Requires-Dist: uuid-utils
 Provides-Extra: testing
 Requires-Dist: diracx-testing; extra == "testing"

{diracx_db-0.0.1a42 → diracx_db-0.0.1a44}/src/diracx_db.egg-info/requires.txt

@@ -2,6 +2,7 @@ diracx-core
 opensearch-py[async]
 pydantic>=2.10
 sqlalchemy[aiomysql,aiosqlite]>=2
+uuid-utils
 
 [testing]
 diracx-testing

{diracx_db-0.0.1a42 → diracx_db-0.0.1a44}/tests/auth/test_refresh_token.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
-from uuid import UUID, uuid4
-
 import pytest
+from uuid_utils import UUID, uuid7
 
 from diracx.db.sql.auth.db import AuthDB
 from diracx.db.sql.auth.schema import RefreshTokenStatus
@@ -20,22 +19,20 @@ async def auth_db(tmp_path):
 async def test_insert(auth_db: AuthDB):
     """Insert two refresh tokens in the DB and check that they don't share the same JWT ID."""
     # Insert a first refresh token
-    jti1 = uuid4()
+    jti1 = uuid7()
     async with auth_db as auth_db:
         await auth_db.insert_refresh_token(
             jti1,
             "subject",
-            "username",
             "vo:lhcb property:NormalUser",
         )
 
     # Insert a second refresh token
-    jti2 = uuid4()
+    jti2 = uuid7()
     async with auth_db as auth_db:
         await auth_db.insert_refresh_token(
             jti2,
             "subject",
-            "username",
             "vo:lhcb property:NormalUser",
         )
 
@@ -48,17 +45,15 @@ async def test_get(auth_db: AuthDB):
     # Refresh token details we want to insert
     refresh_token_details = {
         "sub": "12345",
-        "preferred_username": "John Doe",
         "scope": "vo:lhcb property:NormalUser",
     }
 
     # Insert refresh token details
-    jti = uuid4()
+    jti = uuid7()
     async with auth_db as auth_db:
         await auth_db.insert_refresh_token(
             jti,
             refresh_token_details["sub"],
-            refresh_token_details["preferred_username"],
             refresh_token_details["scope"],
         )
         creation_time = (await auth_db.get_refresh_token(jti))["CreationTime"]
@@ -66,7 +61,6 @@ async def test_get(auth_db: AuthDB):
     # Enrich the dict with the generated refresh token attributes
     expected_refresh_token = {
         "Sub": refresh_token_details["sub"],
-        "PreferredUsername": refresh_token_details["preferred_username"],
         "Scope": refresh_token_details["scope"],
         "JTI": jti,
         "Status": RefreshTokenStatus.CREATED,
@@ -78,7 +72,7 @@ async def test_get(auth_db: AuthDB):
         result = await auth_db.get_refresh_token(jti)
 
     # Make sure they are identical
-    result["JTI"] = UUID(result["JTI"], version=4)
+    result["JTI"] = UUID(result["JTI"])
     assert result == expected_refresh_token
 
 
@@ -97,9 +91,8 @@ async def test_get_user_refresh_tokens(auth_db: AuthDB):
     async with auth_db as auth_db:
         for sub in subjects:
             await auth_db.insert_refresh_token(
-                uuid4(),
+                uuid7(),
                 sub,
-                "username",
                 "scope",
             )
 
@@ -123,11 +116,10 @@ async def test_revoke(auth_db: AuthDB):
     """Insert a refresh token in the DB, revoke it, and make sure it appears as REVOKED in the db."""
     # Insert a refresh token details
     async with auth_db as auth_db:
-        jti = uuid4()
+        jti = uuid7()
         await auth_db.insert_refresh_token(
             jti,
             "subject",
-            "username",
             "scope",
         )
 
@@ -155,9 +147,8 @@ async def test_revoke_user_refresh_tokens(auth_db: AuthDB):
     async with auth_db as auth_db:
         for sub in subjects:
             await auth_db.insert_refresh_token(
-                uuid4(),
+                uuid7(),
                 sub,
-                "username",
                 "scope",
             )
 
@@ -198,11 +189,10 @@ async def test_revoke_and_get_user_refresh_tokens(auth_db: AuthDB):
     jtis = []
     async with auth_db as auth_db:
         for _ in range(nb_tokens):
-            jti = uuid4()
+            jti = uuid7()
             await auth_db.insert_refresh_token(
                 jti,
                 sub,
-                "username",
                 "scope",
             )
             jtis.append(jti)
@@ -248,9 +238,8 @@ async def test_get_refresh_tokens(auth_db: AuthDB):
     async with auth_db as auth_db:
         for sub in subjects:
             await auth_db.insert_refresh_token(
-                uuid4(),
+                uuid7(),
                 sub,
-                "username",
                 "scope",
             )
 

{diracx_db-0.0.1a42 → diracx_db-0.0.1a44}/tests/opensearch/test_search.py

@@ -105,7 +105,9 @@ async def prefilled_db(request):
     impl = request.param
     async with resolve_fixtures_hack(request, impl) as dummy_opensearch_db:
         await dummy_opensearch_db.upsert("dummyvo", 798811211, DOC1)
-        await dummy_opensearch_db.upsert("dummyvo", 998811211, DOC2)
+        # the following line tests if the index name is made properly lowercase in case
+        # the VO has capital letters e.g. "diracAdmin"
+        await dummy_opensearch_db.upsert("dummyVO", 998811211, DOC2)
         await dummy_opensearch_db.upsert("dummyvo", 798811212, DOC3)
 
         # Force a refresh to make sure the documents are available

{diracx_db-0.0.1a42 → diracx_db-0.0.1a44}/tests/test_dummy_db.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
 import asyncio
-from uuid import uuid4
 
 import pytest
+from uuid_utils import uuid7
 
 from diracx.core.exceptions import InvalidQueryError
 from diracx.db.sql.dummy.db import DummyDB
@@ -38,7 +38,7 @@ async def test_insert_and_summary(dummy_db: DummyDB):
 
         # Add cars, belonging to the same guy
         result = await asyncio.gather(
-            *(dummy_db.insert_car(uuid4(), f"model_{i}", owner_id) for i in range(10))
+            *(dummy_db.insert_car(uuid7(), f"model_{i}", owner_id) for i in range(10))
         )
         assert result
 
@@ -100,7 +100,7 @@ async def test_successful_transaction(dummy_db):
         owner_id = await dummy_db.insert_owner(name="Magnum")
         assert owner_id
         result = await asyncio.gather(
-            *(dummy_db.insert_car(uuid4(), f"model_{i}", owner_id) for i in range(10))
+            *(dummy_db.insert_car(uuid7(), f"model_{i}", owner_id) for i in range(10))
         )
         assert result
 
@@ -142,7 +142,7 @@ async def test_failed_transaction(dummy_db):
             assert owner_id
             result = await asyncio.gather(
                 *(
-                    dummy_db.insert_car(uuid4(), f"model_{i}", owner_id)
+                    dummy_db.insert_car(uuid7(), f"model_{i}", owner_id)
                     for i in range(10)
                 )
             )
@@ -211,7 +211,7 @@ async def test_successful_with_exception_transaction(dummy_db):
             assert owner_id
             result = await asyncio.gather(
                 *(
-                    dummy_db.insert_car(uuid4(), f"model_{i}", owner_id)
+                    dummy_db.insert_car(uuid7(), f"model_{i}", owner_id)
                     for i in range(10)
                 )
             )
@@ -248,7 +248,7 @@ async def test_successful_with_exception_transaction(dummy_db):
             assert owner_id
             result = await asyncio.gather(
                 *(
-                    dummy_db.insert_car(uuid4(), f"model_{i}", owner_id)
+                    dummy_db.insert_car(uuid7(), f"model_{i}", owner_id)
                     for i in range(10)
                 )
             )