Merge branch 'dev' into rasswanth/fix-file-format

OpenMined · Oct 3, 2024 · 1538586 · 1538586
2 parents f502f56 + 072c629
commit 1538586
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 10 deletions.
diff --git a/packages/grid/backend/grid/main.py b/packages/grid/backend/grid/main.py
@@ -76,6 +76,8 @@ def create_app() -> FastAPI:
         openapi_url=f"{settings.API_V2_STR}/openapi.json",
         lifespan=lifespan,
         middleware=get_middlewares(),
+        docs_url=None,
+        redoc_url=None,
     )
 
     # instrument app

diff --git a/packages/grid/helm/syft/templates/proxy/proxy-configmap.yaml b/packages/grid/helm/syft/templates/proxy/proxy-configmap.yaml
@@ -38,7 +38,7 @@ data:
             - "web"
           service: "frontend"
         backend:
-          rule: "(PathPrefix(`/api`) || PathPrefix(`/docs`) || PathPrefix(`/redoc`)) && !PathPrefix(`/rtunnel`)"
+          rule: "PathPrefix(`/api`) && !PathPrefix(`/rtunnel`)"
           entryPoints:
             - "web"
           service: "backend"

diff --git a/packages/grid/traefik/docker/dynamic-tls.yml b/packages/grid/traefik/docker/dynamic-tls.yml
@@ -24,13 +24,13 @@ http:
         - websecure
       service: "frontend"
     backend:
-      rule: "PathPrefix(`/api`) || PathPrefix(`/docs`) || PathPrefix(`/redoc`)"
+      rule: "PathPrefix(`/api`)"
       entryPoints:
         - web
         - websecure
       service: "backend"
     backend-stream:
-      rule: "PathPrefix(`/api`) && PathPrefix(`/api/v1/syft/stream`) || PathPrefix(`/docs`) || PathPrefix(`/redoc`)"
+      rule: "PathPrefix(`/api`) && PathPrefix(`/api/v1/syft/stream`)"
       entryPoints:
         - web
         - websecure

diff --git a/packages/grid/traefik/docker/dynamic.yml b/packages/grid/traefik/docker/dynamic.yml
@@ -27,12 +27,12 @@ http:
         - web
       service: "frontend"
     backend:
-      rule: "PathPrefix(`/api`) || PathPrefix(`/docs`) || PathPrefix(`/redoc`)"
+      rule: "PathPrefix(`/api`)"
       entryPoints:
         - web
       service: "backend"
     backend-stream:
-      rule: "PathPrefix(`/api`) && PathPrefix(`/api/v1/syft/stream`) || PathPrefix(`/docs`) || PathPrefix(`/redoc`)"
+      rule: "PathPrefix(`/api`) && PathPrefix(`/api/v1/syft/stream`)"
       entryPoints:
         - web
       service: "backend-stream"

diff --git a/packages/syft/src/syft/service/action/action_service.py b/packages/syft/src/syft/service/action/action_service.py
@@ -565,7 +565,9 @@ def blob_permission(
 
             if result_blob_id is not None:
                 blob_permissions = [blob_permission(x) for x in output_readers]
-                context.server.blob_storage.stash.add_permissions(blob_permissions)
+                context.server.services.blob_storage.stash.add_permissions(
+                    blob_permissions
+                )
 
         return set_result
 

diff --git a/packages/syft/src/syft/util/test_helpers/apis/submit_query.py b/packages/syft/src/syft/util/test_helpers/apis/submit_query.py
@@ -23,10 +23,10 @@ def submit_query(
             name=func_name,
             input_policy=sy.MixedInputPolicy(
                 endpoint=sy.Constant(
-                    val=context.admin_client.api.services.bigquery.test_query
+                    val=context.user_client.api.services.bigquery.test_query
                 ),
                 query=sy.Constant(val=query),
-                client=context.admin_client,
+                client=context.user_client,
             ),
             worker_pool_name=context.settings["user_code_worker"],
         )

diff --git a/packages/syft/src/syft/util/test_helpers/email_helpers.py b/packages/syft/src/syft/util/test_helpers/email_helpers.py
@@ -132,8 +132,8 @@ def relogin(self) -> None:
 
     @client.setter
     def client(self, client):
-        client = client.login(email=self.email, password=self.latest_password)
-        self._client_cache = client
+        this_client = client.login(email=self.email, password=self.latest_password)
+        self._client_cache = this_client
 
     def to_dict(self) -> dict:
         output = {}