nucliadb 6.8.1.post4965__py3-none-any.whl → 6.8.1.post4979__py3-none-any.whl

nucliadb/learning_proxy.py

@@ -43,10 +43,8 @@ logger = logging.getLogger(SERVICE_NAME)
 WHITELISTED_HEADERS = {
     "x-nucliadb-user",
     "x-nucliadb-roles",
-    "x-stf-roles",
-    "x-stf-user",
-    "x-stf-account",
-    "x-stf-account-type",
+    "x-nucliadb-account",
+    "x-nucliadb-account-type",
     "x-forwarded-for",
     "x-forwarded-host",
     "x-forwarded-proto",
@@ -206,14 +204,14 @@ async def learning_config_proxy(
     request: Request,
     method: str,
     url: str,
-    extra_headers: Optional[dict[str, str]] = None,
+    headers: dict[str, str] = {},
 ) -> Union[Response, StreamingResponse]:
     return await proxy(
         service=LearningService.CONFIG,
         request=request,
         method=method,
         url=url,
-        extra_headers=extra_headers,
+        headers=headers,
     )
 
 
@@ -246,24 +244,21 @@ async def proxy(
     request: Request,
     method: str,
     url: str,
-    extra_headers: Optional[dict[str, str]] = None,
+    headers: dict[str, str] = {},
 ) -> Union[Response, StreamingResponse]:
     """
     Proxy the request to a learning API.
 
-    service: LearningService. The learning service to proxy the request to.
-    request: Request. The incoming request.
-    method: str. The HTTP method to use.
-    url: str. The URL to proxy the request to.
-    extra_headers: Optional[dict[str, str]]. Extra headers to include in the proxied request.
+    service: The learning service to proxy the request to.
+    request: The incoming request.
+    method: The HTTP method to use.
+    url: The URL to proxy the request to.
+    headers: Extra headers to include in the proxied request.
 
     Returns: Response. The response from the learning API. If the response is chunked, a StreamingResponse is returned.
     """
-
-    proxied_headers = extra_headers or {}
-    proxied_headers.update(
-        {k.lower(): v for k, v in request.headers.items() if is_white_listed_header(k)}
-    )
+    proxied_headers = {k.lower(): v for k, v in request.headers.items() if is_white_listed_header(k)}
+    proxied_headers.update(**headers)
 
     async with service_client(
         base_url=get_base_url(service=service),

nucliadb/reader/api/v1/learning_config.py

@@ -25,6 +25,7 @@ from nuclia_models.config.proto import ExtractConfig, SplitConfiguration
 
 from nucliadb.learning_proxy import learning_config_proxy
 from nucliadb.models.responses import HTTPClientError
+from nucliadb.reader import logger
 from nucliadb.reader.api.v1.router import KB_PREFIX, api
 from nucliadb_models.resource import NucliaDBRoles
 from nucliadb_utils.authentication import requires_one
@@ -68,7 +69,7 @@ async def get_configuration(
         request,
         "GET",
         f"/config/{kbid}",
-        extra_headers={"X-STF-USER": request.headers.get("X-NUCLIADB-USER", "")},
+        headers={"account-id": request.headers.get("x-nucliadb-account", "")},
     )
 
 
@@ -108,7 +109,6 @@ async def get_model(
         request,
         "GET",
         f"/models/{kbid}/model/{model_id}",
-        extra_headers={"X-STF-USER": request.headers.get("X-NUCLIADB-USER", "")},
     )
 
 
@@ -126,7 +126,17 @@ async def get_schema_for_configuration_updates(
     request: Request,
     kbid: str,
 ):
-    return await learning_config_proxy(request, "GET", f"/schema/{kbid}")
+    account_id = request.headers.get("x-nucliadb-account", "")
+    if not account_id:
+        logger.warning(
+            "Account header not sent by authorizer", extra={"request_headers": request.headers}
+        )
+    return await learning_config_proxy(
+        request,
+        "GET",
+        f"/schema/{kbid}",
+        headers={"account-id": account_id},
+    )
 
 
 @api.get(

{nucliadb-6.8.1.post4965.dist-info → nucliadb-6.8.1.post4979.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nucliadb
-Version: 6.8.1.post4965
+Version: 6.8.1.post4979
 Summary: NucliaDB
 Author-email: Nuclia <nucliadb@nuclia.com>
 License-Expression: AGPL-3.0-or-later
@@ -19,11 +19,11 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: <4,>=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: nucliadb-telemetry[all]>=6.8.1.post4965
-Requires-Dist: nucliadb-utils[cache,fastapi,storages]>=6.8.1.post4965
-Requires-Dist: nucliadb-protos>=6.8.1.post4965
-Requires-Dist: nucliadb-models>=6.8.1.post4965
-Requires-Dist: nidx-protos>=6.8.1.post4965
+Requires-Dist: nucliadb-telemetry[all]>=6.8.1.post4979
+Requires-Dist: nucliadb-utils[cache,fastapi,storages]>=6.8.1.post4979
+Requires-Dist: nucliadb-protos>=6.8.1.post4979
+Requires-Dist: nucliadb-models>=6.8.1.post4979
+Requires-Dist: nidx-protos>=6.8.1.post4979
 Requires-Dist: nucliadb-admin-assets>=1.0.0.post1224
 Requires-Dist: nuclia-models>=0.47.0
 Requires-Dist: uvicorn[standard]

{nucliadb-6.8.1.post4965.dist-info → nucliadb-6.8.1.post4979.dist-info}/RECORD

@@ -47,7 +47,7 @@ migrations/pg/0009_extract_facets_safety.py,sha256=k9Appx7ipp3wDyLy70qgw9oLjN7N6
 migrations/pg/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
 nucliadb/__init__.py,sha256=_abCmDJ_0ku483Os4UAjPX7Nywm39cQgAV_DiyjsKeQ,891
 nucliadb/health.py,sha256=UIxxA4oms4HIsCRZM_SZsdkIZIlgzmOxw-qSHLlWuak,3465
-nucliadb/learning_proxy.py,sha256=CGwKlKHMDYMMRj5-8M4nNvsV3O88A2mLRr0kfjSZTBA,19341
+nucliadb/learning_proxy.py,sha256=2ucru4pHfFYWdjt875YKeGBjx1sZ7lGvS5Xnp6l2ZNs,19173
 nucliadb/metrics_exporter.py,sha256=CdfDqKqR-4xMjZxITl6F6mV539iXVsF5ovXCPHjKp40,5341
 nucliadb/openapi.py,sha256=dI5hHSUs2oHf4fd27gGagVltWfjVZPIoVqMtIN04VJk,2290
 nucliadb/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -206,7 +206,7 @@ nucliadb/reader/api/v1/__init__.py,sha256=ieP8lsCCwG66Jupv8II5MSTj6nh3eCtLcF4utH
 nucliadb/reader/api/v1/download.py,sha256=F48YM3BPwuHwDgYk0jjRHHJHh732QUb4nCAS5xyNqzg,10819
 nucliadb/reader/api/v1/export_import.py,sha256=x4VBNDFjnlY1nIt5kdq0eZTB_DeRzGzT8T7uB7wUhNU,6448
 nucliadb/reader/api/v1/knowledgebox.py,sha256=e8q7v5JwGxsuPZLc_GkUOkWWSJMI2o483bK9ywhdkk8,3612
-nucliadb/reader/api/v1/learning_config.py,sha256=fNnv-7CuhTu_p6aDkuMLRP5-R5Try-_prKhh8Woq1Pw,6830
+nucliadb/reader/api/v1/learning_config.py,sha256=SItQbdISCuJS0i0RHU6vAwXpHEelxrf_cZK5yQak4PE,7071
 nucliadb/reader/api/v1/resource.py,sha256=WTBIEywfHfy4sIffnVm9s__3--JpHi9hprVpK0Ddd04,14164
 nucliadb/reader/api/v1/router.py,sha256=eyNmEGSP9zHkCIG5XlAXl6sukq950B7gFT3X2peMtIE,1011
 nucliadb/reader/api/v1/services.py,sha256=Fcj4fRDBNnIwnf5Q3VZxpP_6UwdPYOtyEZUGr9_lhqo,13438
@@ -379,8 +379,8 @@ nucliadb/writer/tus/local.py,sha256=7jYa_w9b-N90jWgN2sQKkNcomqn6JMVBOVeDOVYJHto,
 nucliadb/writer/tus/s3.py,sha256=vu1BGg4VqJ_x2P1u2BxqPKlSfw5orT_a3R-Ln5oPUpU,8483
 nucliadb/writer/tus/storage.py,sha256=ToqwjoYnjI4oIcwzkhha_MPxi-k4Jk3Lt55zRwaC1SM,2903
 nucliadb/writer/tus/utils.py,sha256=MSdVbRsRSZVdkaum69_0wku7X3p5wlZf4nr6E0GMKbw,2556
-nucliadb-6.8.1.post4965.dist-info/METADATA,sha256=QFrP-BjOYg7Bc7zaHPxkBCFi2f9ybaHcJ2O67hkylqY,4158
-nucliadb-6.8.1.post4965.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nucliadb-6.8.1.post4965.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
-nucliadb-6.8.1.post4965.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
-nucliadb-6.8.1.post4965.dist-info/RECORD,,
+nucliadb-6.8.1.post4979.dist-info/METADATA,sha256=Bp9I_V8pCDvtLHcCCtORjqkA_EQLt7Cy51GIFWI4LrY,4158
+nucliadb-6.8.1.post4979.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nucliadb-6.8.1.post4979.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
+nucliadb-6.8.1.post4979.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
+nucliadb-6.8.1.post4979.dist-info/RECORD,,