reverted some changes

Andrei Neagu · Andrei Neagu · commit 072498cf4aa7 · 2024-11-12T08:22:53.000+01:00
diff --git a/packages/models-library/src/models_library/api_schemas_directorv2/clusters.py b/packages/models-library/src/models_library/api_schemas_directorv2/clusters.py
@@ -144,9 +144,9 @@ class ClusterCreate(BaseCluster):
                         "password": "somepassword",
                     },
                     "accessRights": {
-                        "154": CLUSTER_ADMIN_RIGHTS.model_dump(),
-                        "12": CLUSTER_MANAGER_RIGHTS.model_dump(),
-                        "7899": CLUSTER_USER_RIGHTS.model_dump(),
+                        154: CLUSTER_ADMIN_RIGHTS.model_dump(),  # type:ignore[dict-item]
+                        12: CLUSTER_MANAGER_RIGHTS.model_dump(),  # type:ignore[dict-item]
+                        7899: CLUSTER_USER_RIGHTS.model_dump(),  # type:ignore[dict-item]
                     },
                 },
             ]
@@ -190,9 +190,9 @@ class ClusterPatch(BaseCluster):
                 },
                 {
                     "accessRights": {
-                        "154": CLUSTER_ADMIN_RIGHTS.model_dump(),
-                        "12": CLUSTER_MANAGER_RIGHTS.model_dump(),
-                        "7899": CLUSTER_USER_RIGHTS.model_dump(),
+                        154: CLUSTER_ADMIN_RIGHTS.model_dump(),  # type:ignore[dict-item]
+                        12: CLUSTER_MANAGER_RIGHTS.model_dump(),  # type:ignore[dict-item]
+                        7899: CLUSTER_USER_RIGHTS.model_dump(),  # type:ignore[dict-item]
                     },
                 },
             ]
diff --git a/packages/models-library/src/models_library/clusters.py b/packages/models-library/src/models_library/clusters.py
@@ -86,10 +86,7 @@ class JupyterHubTokenAuthentication(BaseAuthentication):
     model_config = ConfigDict(
         json_schema_extra={
             "examples": [
-                {
-                    "type": "jupyterhub",
-                    "api_token": "some_jupyterhub_token",
-                },
+                {"type": "jupyterhub", "api_token": "some_jupyterhub_token"},
             ]
         }
     )
@@ -143,9 +140,7 @@ class BaseCluster(BaseModel):
     )
     endpoint: AnyUrl
     authentication: ClusterAuthentication = Field(
-        ...,
-        description="Dask gateway authentication",
-        discriminator="type",
+        ..., description="Dask gateway authentication", discriminator="type"
     )
     access_rights: dict[GroupID, ClusterAccessRights] = Field(default_factory=dict)
 
diff --git a/services/web/server/src/simcore_service_webserver/director_v2/_models.py b/services/web/server/src/simcore_service_webserver/director_v2/_models.py
@@ -65,9 +65,9 @@ def set_default_thumbnail_if_empty(cls, v, values):
                         "password": "somepassword",
                     },
                     "access_rights": {
-                        "154": CLUSTER_ADMIN_RIGHTS.model_dump(),
-                        "12": CLUSTER_MANAGER_RIGHTS.model_dump(),
-                        "7899": CLUSTER_USER_RIGHTS.model_dump(),
+                        154: CLUSTER_ADMIN_RIGHTS.model_dump(),  # type:ignore[dict-item]
+                        12: CLUSTER_MANAGER_RIGHTS.model_dump(),  # type:ignore[dict-item]
+                        7899: CLUSTER_USER_RIGHTS.model_dump(),  # type:ignore[dict-item]
                     },
                 },
             ]

Original file line number	Diff line number	Diff line change
`@@ -86,10 +86,7 @@ class JupyterHubTokenAuthentication(BaseAuthentication):`
`86`	`86`	`model_config = ConfigDict(`
`87`	`87`	`json_schema_extra={`
`88`	`88`	`"examples": [`
`89`		`- {`
`90`		`- "type": "jupyterhub",`
`91`		`- "api_token": "some_jupyterhub_token",`
`92`		`- },`
	`89`	`+ {"type": "jupyterhub", "api_token": "some_jupyterhub_token"},`
`93`	`90`	`]`
`94`	`91`	`}`
`95`	`92`	`)`
`@@ -143,9 +140,7 @@ class BaseCluster(BaseModel):`
`143`	`140`	`)`
`144`	`141`	`endpoint: AnyUrl`
`145`	`142`	`authentication: ClusterAuthentication = Field(`
`146`		`- ...,`
`147`		`- description="Dask gateway authentication",`
`148`		`- discriminator="type",`
	`143`	`+ ..., description="Dask gateway authentication", discriminator="type"`
`149`	`144`	`)`
`150`	`145`	`access_rights: dict[GroupID, ClusterAccessRights] = Field(default_factory=dict)`
`151`	`146`