nucliadb-utils 3.2.0.post513__py3-none-any.whl → 4.0.0.post516__py3-none-any.whl

nucliadb_utils/cache/settings.py

@@ -19,7 +19,7 @@
 
 from typing import List, Optional
 
-from pydantic import BaseSettings
+from pydantic_settings import BaseSettings
 
 
 class Settings(BaseSettings):

nucliadb_utils/featureflagging.py

@@ -21,14 +21,14 @@ import json
 from typing import Any, Optional
 
 import mrflagly
-import pydantic
+import pydantic_settings
 
 from nucliadb_utils import const
 from nucliadb_utils.settings import nuclia_settings, running_settings
 
 
-class Settings(pydantic.BaseSettings):
-    flag_settings_url: Optional[str]
+class Settings(pydantic_settings.BaseSettings):
+    flag_settings_url: Optional[str] = None
 
 
 DEFAULT_FLAG_DATA: dict[str, Any] = {

nucliadb_utils/settings.py

@@ -20,8 +20,8 @@
 from enum import Enum
 from typing import Dict, List, Optional
 
-from pydantic import BaseSettings, Field
-from pydantic.class_validators import root_validator
+from pydantic import AliasChoices, Field, model_validator
+from pydantic_settings import BaseSettings
 
 
 class RunningSettings(BaseSettings):
@@ -29,7 +29,7 @@ class RunningSettings(BaseSettings):
     sentry_url: Optional[str] = None
     running_environment: str = Field(
         default="local",
-        env=["environment", "running_environment"],
+        validation_alias=AliasChoices("environment", "running_environment"),
         description="Running environment. One of: local, test, stage, prod",
     )
     metrics_port: int = 3030
@@ -48,7 +48,7 @@ class HTTPSettings(BaseSettings):
 http_settings = HTTPSettings()
 
 
-class FileBackendConfig(str, Enum):
+class FileBackendConfig(Enum):
     GCS = "gcs"
     S3 = "s3"
     PG = "pg"
@@ -130,7 +130,9 @@ class NucliaSettings(BaseSettings):
         "http://processing-api.processing.svc.cluster.local:8080"
     )
     nuclia_inner_predict_url: str = "http://predict.learning.svc.cluster.local:8080"
-    learning_internal_svc_base_url = "http://{service}.learning.svc.cluster.local:8080"
+    learning_internal_svc_base_url: str = (
+        "http://{service}.learning.svc.cluster.local:8080"
+    )
 
     nuclia_zone: str = "europe-1"
     onprem: bool = True
@@ -145,7 +147,8 @@ class NucliaSettings(BaseSettings):
     local_predict: bool = False
     local_predict_headers: Dict[str, str] = {}
 
-    @root_validator(pre=True)
+    @model_validator(mode="before")
+    @classmethod
     def check_onprem_does_not_use_jwt_key(cls, values):
         if values.get("onprem") and values.get("jwt_key") is not None:
             raise ValueError("Invalid validation")

nucliadb_utils/storages/settings.py

@@ -20,7 +20,7 @@
 import os
 from typing import Dict, Optional
 
-from pydantic import BaseSettings
+from pydantic_settings import BaseSettings
 
 
 class Settings(BaseSettings):

nucliadb_utils/tests/unit/test_utilities.py

@@ -24,6 +24,7 @@ import pytest
 
 from nucliadb_utils import featureflagging, utilities
 from nucliadb_utils.exceptions import ConfigurationError
+from nucliadb_utils.settings import FileBackendConfig
 
 
 @pytest.fixture(autouse=True)
@@ -42,7 +43,9 @@ def test_clean_utility():
 async def test_get_storage_s3():
     s3 = AsyncMock()
     with (
-        patch.object(utilities.storage_settings, "file_backend", "s3"),
+        patch.object(
+            utilities.storage_settings, "file_backend", FileBackendConfig("s3")
+        ),
         patch("nucliadb_utils.storages.s3.S3Storage", return_value=s3),
     ):
         assert await utilities.get_storage() == s3
@@ -52,7 +55,9 @@ async def test_get_storage_s3():
 async def test_get_storage_gcs():
     gcs = AsyncMock()
     with (
-        patch.object(utilities.storage_settings, "file_backend", "gcs"),
+        patch.object(
+            utilities.storage_settings, "file_backend", FileBackendConfig("gcs")
+        ),
         patch("nucliadb_utils.storages.gcs.GCSStorage", return_value=gcs),
     ):
         assert await utilities.get_storage() == gcs
@@ -62,7 +67,9 @@ async def test_get_storage_gcs():
 async def test_get_storage_pg():
     pg = AsyncMock()
     with (
-        patch.object(utilities.storage_settings, "file_backend", "pg"),
+        patch.object(
+            utilities.storage_settings, "file_backend", FileBackendConfig("pg")
+        ),
         patch("nucliadb_utils.storages.pg.PostgresStorage", return_value=pg),
     ):
         assert await utilities.get_storage() == pg
@@ -72,7 +79,9 @@ async def test_get_storage_pg():
 async def test_get_storage_local():
     local = AsyncMock()
     with (
-        patch.object(utilities.storage_settings, "file_backend", "local"),
+        patch.object(
+            utilities.storage_settings, "file_backend", FileBackendConfig("local")
+        ),
         patch.object(utilities.storage_settings, "local_files", "/files"),
         patch("nucliadb_utils.storages.local.LocalStorage", return_value=local),
     ):

{nucliadb_utils-3.2.0.post513.dist-info → nucliadb_utils-4.0.0.post516.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nucliadb-utils
-Version: 3.2.0.post513
+Version: 4.0.0.post516
 Home-page: https://nuclia.com
 License: BSD
 Classifier: Development Status :: 4 - Beta
@@ -11,7 +11,8 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.9, <4
-Requires-Dist: pydantic <2.0,>=1.8.2
+Requires-Dist: pydantic >=2.7
+Requires-Dist: pydantic-settings >=2.2
 Requires-Dist: aiohttp >=3.9.4
 Requires-Dist: prometheus-client >=0.12.0
 Requires-Dist: types-requests >=2.27.7
@@ -20,8 +21,8 @@ Requires-Dist: nats-py[nkeys] >=2.6.0
 Requires-Dist: pyjwt >=2.4.0
 Requires-Dist: memorylru >=1.1.2
 Requires-Dist: mrflagly
-Requires-Dist: nucliadb-protos >=3.2.0.post513
-Requires-Dist: nucliadb-telemetry >=3.2.0.post513
+Requires-Dist: nucliadb-protos >=4.0.0.post516
+Requires-Dist: nucliadb-telemetry >=4.0.0.post516
 Provides-Extra: cache
 Requires-Dist: redis >=4.3.4 ; extra == 'cache'
 Requires-Dist: orjson >=3.6.7 ; extra == 'cache'

{nucliadb_utils-3.2.0.post513.dist-info → nucliadb_utils-4.0.0.post516.dist-info}/RECORD

@@ -4,7 +4,7 @@ nucliadb_utils/authentication.py,sha256=HTj6kFFrfdN4-DW_MNqldAPqNPdPwGHnSWl-Sigi
 nucliadb_utils/const.py,sha256=V9SWXB_Nfy0qqgPkQcEYN_zj90WkOpLubeixRKUprfM,2391
 nucliadb_utils/debug.py,sha256=saSfh_CDQoQl-35KCyqef5hdB_OVdrIEnlmWnZU18vg,2470
 nucliadb_utils/exceptions.py,sha256=y_3wk77WLVUtdo-5FtbBsdSkCtK_DsJkdWb5BoPn3qo,1094
-nucliadb_utils/featureflagging.py,sha256=c__VxSnYmH7oI9MSaUBLXghE8zE-q45neJWbc8hYejU,2715
+nucliadb_utils/featureflagging.py,sha256=M94p2qQROCmeMX_N3PPvzAR3iaNBGvjwdE1-aAAWp1k,2740
 nucliadb_utils/grpc.py,sha256=USXwPRuCJiSyLf0JW4isIKZne6od8gM_GGLWaHHjknk,3336
 nucliadb_utils/helpers.py,sha256=fOL6eImdvKO3NV39ymmo2UOCT-GAK1dfXKoMKdzdmFo,1599
 nucliadb_utils/indexing.py,sha256=ELJ9bTnrxcb6tmO77HzzO1SDLPmKXTc_nBiLnJocz5I,3462
@@ -12,7 +12,7 @@ nucliadb_utils/nats.py,sha256=7hRKMflwxK-p_L0KFO5jibOGhzSw2F24mKvPG-A_iN8,8224
 nucliadb_utils/partition.py,sha256=0tmXuwRM_v-OmKoRkB--OMDzomVEkmgxqMmNNomI_24,1173
 nucliadb_utils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nucliadb_utils/run.py,sha256=bKMfsPEK6WdWfiPyWPUxCqcLo4tq6eOwyaf910TOwBk,1713
-nucliadb_utils/settings.py,sha256=D3ZTeOVE1YvZ_DAgop8flNqWbwGWNpRJURjbJPbmmzM,7209
+nucliadb_utils/settings.py,sha256=sFvYT903OFoIz1do0kDnxVLLucQ1nJDxPPJZJyofqow,7280
 nucliadb_utils/signals.py,sha256=KxV4UUNWf4wrEbt1iJzy6PxYuTEhi6IRisKlYlq5OtM,2702
 nucliadb_utils/store.py,sha256=kQ35HemE0v4_Qg6xVqNIJi8vSFAYQtwI3rDtMsNy62Y,890
 nucliadb_utils/transaction.py,sha256=CQpsuF-E2omh4gGMxXCn0dv7vL9ctxooWpSgWGbGfBA,7212
@@ -25,7 +25,7 @@ nucliadb_utils/cache/__init__.py,sha256=itSI7dtTwFP55YMX4iK7JzdMHS5CQVUiB1XzQu4U
 nucliadb_utils/cache/exceptions.py,sha256=Zu-O_-0-yctOEgoDGI92gPzWfBMRrpiAyESA62ld6MA,975
 nucliadb_utils/cache/nats.py,sha256=h0x894QNLkkvyOcmqH8ncC-d0AiHm9SjDgvPPiwxYao,7089
 nucliadb_utils/cache/pubsub.py,sha256=l8i_RwRf7OPzfmPy-gyn66xgYFs5aHidCIjEaU9VOHE,1654
-nucliadb_utils/cache/settings.py,sha256=tG8SWwnJjeE_AovEgCisfxhl-hzklm1Yb9nvwYSgW1A,1050
+nucliadb_utils/cache/settings.py,sha256=WVeHOE6Re5i4k2hUHdFKfkoL4n83v_Z6UPBK6GHYb8g,1059
 nucliadb_utils/fastapi/__init__.py,sha256=itSI7dtTwFP55YMX4iK7JzdMHS5CQVUiB1XzQu4UBh8,833
 nucliadb_utils/fastapi/openapi.py,sha256=b0pLuri0QuzQd0elDyOVXM42YYmES_cmT-jEfsQ1G6Y,1737
 nucliadb_utils/fastapi/run.py,sha256=n6vOX64QqF1I5n4UlKnpm_ZJ24rmwfRGi-J9YMGpZzA,3631
@@ -37,7 +37,7 @@ nucliadb_utils/storages/local.py,sha256=SZrBkxnGg8DoMHlT4GaBP5LqMwi6QAe-d_eLU2MJ
 nucliadb_utils/storages/nuclia.py,sha256=UfvRu92eqG1v-PE-UWH2x8KEJFqDqATMmUGFmEuqSSs,2097
 nucliadb_utils/storages/pg.py,sha256=vxx8FQIToA_C6CO1uu9W080yZl0SgUVtTEWd6lQhPJc,18610
 nucliadb_utils/storages/s3.py,sha256=EYfn2CjoVL0tPFUqMaHgJYHjrSQaIUzLeNYoRa1qp-A,18809
-nucliadb_utils/storages/settings.py,sha256=bUl3D7To-s3OVXPFFF7LwJbEKGF2WvDM14pwqQdkyoQ,1276
+nucliadb_utils/storages/settings.py,sha256=ugCPy1zxBOmA2KosT-4tsjpvP002kg5iQyi42yCGCJA,1285
 nucliadb_utils/storages/storage.py,sha256=W8pDa5pXTvfDY5ugEPVESpnkpDE7hnj7jnQQaKdlXk8,20559
 nucliadb_utils/tests/__init__.py,sha256=Oo9CAE7B0eW5VHn8sHd6o30SQzOWUhktLPRXdlDOleA,1456
 nucliadb_utils/tests/asyncbenchmark.py,sha256=rN_NNDk4ras0qgFp0QlRyAi9ZU9xITdzxl2s5CigzBo,10698
@@ -57,14 +57,14 @@ nucliadb_utils/tests/unit/test_run.py,sha256=VHeojVBj_AfV_uNch9eEi4zCT-O94VKjwb_
 nucliadb_utils/tests/unit/test_signals.py,sha256=Br3BjBZpAtKPqeSmfHSGf1Seu4mB2OBWFCgLcNEH0PQ,2647
 nucliadb_utils/tests/unit/test_tests.py,sha256=-YHgVMKJr_3WYwrBj9TnwpVLIkP80PLZpWnvAIYvnz8,1189
 nucliadb_utils/tests/unit/test_transaction.py,sha256=ULVALWbMWEkH2Gq5Q8olEL8k8Kqyh5RAe0Lp9qdF1V4,3917
-nucliadb_utils/tests/unit/test_utilities.py,sha256=ngJSkqqr4XnFWcaRNb8hqsffEMx7KwZ2crMW7ALr8v4,5159
+nucliadb_utils/tests/unit/test_utilities.py,sha256=KcHSPp3RZyKAnscJrIwc2M3PCD3l1DWb6WuqtI6cl5o,5377
 nucliadb_utils/tests/unit/storages/__init__.py,sha256=itSI7dtTwFP55YMX4iK7JzdMHS5CQVUiB1XzQu4UBh8,833
 nucliadb_utils/tests/unit/storages/test_aws.py,sha256=GCsB_jwCUNV3Ogt8TZZEmNKAHvOlR0HGU7blrFbtJqs,1924
 nucliadb_utils/tests/unit/storages/test_gcs.py,sha256=2XzJwgNpfjVGjtE-QdZhu3ayuT1EMEXINdM-_SatPCY,3554
 nucliadb_utils/tests/unit/storages/test_pg.py,sha256=sJfUttMSzq8W1XYolAUcMxl_R5HcEzb5fpCklPeMJiY,17000
 nucliadb_utils/tests/unit/storages/test_storage.py,sha256=VFpRq6Q6BjnIrBQCumYzR8DQUacwhxt5CzTKSlqqD24,6892
-nucliadb_utils-3.2.0.post513.dist-info/METADATA,sha256=lENwTrBsXrXC5Y7v4BIUezoHAQVh9YsG5sQwD5zm6Tc,1925
-nucliadb_utils-3.2.0.post513.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-nucliadb_utils-3.2.0.post513.dist-info/top_level.txt,sha256=fE3vJtALTfgh7bcAWcNhcfXkNPp_eVVpbKK-2IYua3E,15
-nucliadb_utils-3.2.0.post513.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-nucliadb_utils-3.2.0.post513.dist-info/RECORD,,
+nucliadb_utils-4.0.0.post516.dist-info/METADATA,sha256=LNMe6roe8eKyLIbxDOI5aPaOLus4afnwlVPt0Kk3pTM,1957
+nucliadb_utils-4.0.0.post516.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+nucliadb_utils-4.0.0.post516.dist-info/top_level.txt,sha256=fE3vJtALTfgh7bcAWcNhcfXkNPp_eVVpbKK-2IYua3E,15
+nucliadb_utils-4.0.0.post516.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+nucliadb_utils-4.0.0.post516.dist-info/RECORD,,