fix pylint

Author: giancarloromeo

packages/models-library/src/models_library/projects.py

@@ -113,6 +113,13 @@ def convert_sql_alchemy_enum(cls, v):
     )
 
 
+def _patch_json_schema_extra(schema: dict) -> None:
+    # Patch to allow jsonschema nullable
+    # SEE https://github.com/samuelcolvin/pydantic/issues/990#issuecomment-645961530
+    state_pydantic_schema = deepcopy(schema["properties"]["state"])
+    schema["properties"]["state"] = {"anyOf": [{"type": "null"}, state_pydantic_schema]}
+
+
 class Project(BaseProjectModel):
     # NOTE: This is the pydantic pendant of project-v0.0.1.json used in the API of the webserver/webclient
     # NOT for usage with DB!!
@@ -172,14 +179,6 @@ class Project(BaseProjectModel):
         alias="workspaceId",
     )
 
-    def _patch_json_schema_extra(self, schema: dict) -> None:
-        # Patch to allow jsonschema nullable
-        # SEE https://github.com/samuelcolvin/pydantic/issues/990#issuecomment-645961530
-        state_pydantic_schema = deepcopy(schema["properties"]["state"])
-        schema["properties"]["state"] = {
-            "anyOf": [{"type": "null"}, state_pydantic_schema]
-        }
-
     model_config = ConfigDict(
         title="osparc-simcore project",
         extra="forbid",

packages/models-library/src/models_library/projects_nodes.py

@@ -113,6 +113,16 @@ class NodeState(BaseModel):
     )
 
 
+def _patch_json_schema_extra(schema: dict) -> None:
+    # NOTE: exporting without this trick does not make runHash as nullable.
+    # It is a Pydantic issue see https://github.com/samuelcolvin/pydantic/issues/1270
+    for prop_name in ["parent", "runHash"]:
+        if prop_name in schema.get("properties", {}):
+            prop = deepcopy(schema["properties"][prop_name])
+            prop["nullable"] = True
+            schema["properties"][prop_name] = prop
+
+
 class Node(BaseModel):
     key: ServiceKey = Field(
         ...,
@@ -234,15 +244,6 @@ def convert_from_enum(cls, v):
             return NodeState(currentStatus=running_state_value)
         return v
 
-    def _patch_json_schema_extra(self, schema: dict) -> None:
-        # NOTE: exporting without this trick does not make runHash as nullable.
-        # It is a Pydantic issue see https://github.com/samuelcolvin/pydantic/issues/1270
-        for prop_name in ["parent", "runHash"]:
-            if prop_name in schema.get("properties", {}):
-                prop = deepcopy(schema["properties"][prop_name])
-                prop["nullable"] = True
-                schema["properties"][prop_name] = prop
-
     model_config = ConfigDict(
         extra="forbid",
         json_schema_extra=_patch_json_schema_extra,  # type: ignore[typeddict-item]

packages/models-library/src/models_library/utils/json_serialization.py

@@ -56,8 +56,8 @@ def decimal_encoder(dec_value: Decimal) -> int | float:
     """
     if dec_value.as_tuple().exponent >= 0:  # type: ignore[operator]
         return int(dec_value)
-    else:
-        return float(dec_value)
+
+    return float(dec_value)
 
 
 ENCODERS_BY_TYPE: dict[type[Any], Callable[[Any], Any]] = {
@@ -95,7 +95,8 @@ def pydantic_encoder(obj: Any) -> Any:
 
     if isinstance(obj, BaseModel):
         return obj.model_dump()
-    elif is_dataclass(obj):
+
+    if is_dataclass(obj):
         return asdict(obj)  # type: ignore[call-overload]
 
     # Check the class type and its superclasses for a matching encoder