Simplify and add explicit ignores

eleftherioszisis · eleftherioszisis · commit e3c47c969a15 · 2025-09-09T14:24:39.000+02:00
diff --git a/app/schemas/circuit.py b/app/schemas/circuit.py
@@ -1,5 +1,4 @@
 import uuid
-from typing import Annotated
 
 from pydantic import BaseModel, ConfigDict
 
@@ -38,4 +37,4 @@ class CircuitCreate(CircuitBase, ScientificArtifactCreate):
     pass
 
 
-CircuitUpdate = Annotated[BaseModel, make_update_schema(CircuitCreate, "CircuitUpdate")]
+CircuitUpdate = make_update_schema(CircuitCreate, "CircuitUpdate")  # pyright: ignore [reportInvalidTypeForm]
diff --git a/app/schemas/density.py b/app/schemas/density.py
@@ -1,5 +1,4 @@
 import uuid
-from typing import Annotated
 
 from pydantic import BaseModel, ConfigDict
 
@@ -75,22 +74,17 @@ class ExperimentalSynapsesPerConnectionCreate(ExperimentalDensityCreate):
     post_region_id: uuid.UUID
 
 
-ExperimentalSynapsesPerConnectionUpdate = Annotated[
-    BaseModel,
-    make_update_schema(
-        ExperimentalSynapsesPerConnectionCreate, "ExperimentalSynapsesPerConnectionUpdate"
-    ),
-]
+ExperimentalSynapsesPerConnectionUpdate = make_update_schema(
+    ExperimentalSynapsesPerConnectionCreate, "ExperimentalSynapsesPerConnectionUpdate"
+)  # pyright: ignore [reportInvalidTypeForm]
 
-ExperimentalBoutonDensityUpdate = Annotated[
-    BaseModel,
-    make_update_schema(ExperimentalBoutonDensityCreate, "ExperimentalBoutonDensityUpdate"),
-]
+ExperimentalBoutonDensityUpdate = make_update_schema(
+    ExperimentalBoutonDensityCreate, "ExperimentalBoutonDensityUpdate"
+)  # pyright: ignore [reportInvalidTypeForm]
 
-ExperimentalNeuronDensityUpdate = Annotated[
-    BaseModel,
-    make_update_schema(ExperimentalNeuronDensityCreate, "ExperimentalNeuronDensityUpdate"),
-]
+ExperimentalNeuronDensityUpdate = make_update_schema(
+    ExperimentalNeuronDensityCreate, "ExperimentalNeuronDensityUpdate"
+)  # pyright: ignore [reportInvalidTypeForm]
 
 
 class ExperimentalNeuronDensityRead(ExperimentalDensityRead):
diff --git a/app/schemas/electrical_cell_recording.py b/app/schemas/electrical_cell_recording.py
@@ -72,9 +72,9 @@ class ElectricalCellRecordingCreate(ElectricalCellRecordingBase, ScientificArtif
     pass
 
 
-ElectricalCellRecordingUpdate = Annotated[
-    BaseModel, make_update_schema(ElectricalCellRecordingCreate, "ElectricalCellRecordingUpdate")
-]
+ElectricalCellRecordingUpdate = make_update_schema(
+    ElectricalCellRecordingCreate, "ElectricalCellRecordingUpdate"
+)  # pyright : ignore [reportInvalidTypeForm]
 
 
 class ElectricalCellRecordingRead(
diff --git a/app/schemas/electrical_recording_stimulus.py b/app/schemas/electrical_recording_stimulus.py
@@ -1,5 +1,4 @@
 import uuid
-from typing import Annotated
 
 from pydantic import BaseModel
 
@@ -50,7 +49,6 @@ class ElectricalRecordingStimulusCreate(
     pass
 
 
-ElectricalRecordingStimulusUpdate = Annotated[
-    BaseModel,
-    make_update_schema(ElectricalRecordingStimulusCreate, "ElectricalRecordingStimulusUpdate"),
-]
+ElectricalRecordingStimulusUpdate = make_update_schema(
+    ElectricalRecordingStimulusCreate, "ElectricalRecordingStimulusUpdate"
+)  # pyright: ignore [reportInvalidTypeForm]
diff --git a/app/schemas/emodel.py b/app/schemas/emodel.py
@@ -1,5 +1,4 @@
 import uuid
-from typing import Annotated
 
 from pydantic import BaseModel, ConfigDict
 
@@ -41,7 +40,7 @@ class EModelCreate(EModelBase, AuthorizationOptionalPublicMixin):
     exemplar_morphology_id: uuid.UUID
 
 
-EModelUpdate = Annotated[BaseModel, make_update_schema(EModelCreate, "EModelUpdate")]
+EModelUpdate = make_update_schema(EModelCreate, "EModelUpdate")  # pyright: ignore [reportInvalidTypeForm]
 
 
 class EModelRead(
diff --git a/app/schemas/ion_channel_model.py b/app/schemas/ion_channel_model.py
@@ -1,5 +1,3 @@
-from typing import Annotated
-
 from pydantic import BaseModel, ConfigDict, Field
 
 from app.schemas.asset import AssetsMixin
@@ -47,9 +45,7 @@ class IonChannelModelCreate(
     pass
 
 
-IonChannelModelUpdate = Annotated[
-    BaseModel, make_update_schema(IonChannelModelCreate, "IonChannelModelUpdate")
-]
+IonChannelModelUpdate = make_update_schema(IonChannelModelCreate, "IonChannelModelUpdate")  # pyright: ignore [reportInvalidTypeForm]
 
 
 class IonChannelModelRead(
diff --git a/app/schemas/me_model.py b/app/schemas/me_model.py
@@ -1,5 +1,4 @@
 import uuid
-from typing import Annotated
 
 from pydantic import BaseModel, ConfigDict
 
@@ -43,7 +42,7 @@ class MEModelCreate(MEModelBase, AuthorizationOptionalPublicMixin):
     strain_id: uuid.UUID | None = None
 
 
-MEModelUpdate = Annotated[BaseModel, make_update_schema(MEModelCreate, "MEModelUpdate")]
+MEModelUpdate = make_update_schema(MEModelCreate, "MEModelUpdate")  # pyright: ignore [reportInvalidTypeForm]
 
 
 class MEModelRead(
diff --git a/app/schemas/memodel_calibration_result.py b/app/schemas/memodel_calibration_result.py
@@ -1,5 +1,4 @@
 import uuid
-from typing import Annotated
 
 from pydantic import BaseModel
 
@@ -38,6 +37,6 @@ class MEModelCalibrationResultCreate(
     """Create model for MEModel calibration results."""
 
 
-MEModelCalibrationResultUpdate = Annotated[
-    BaseModel, make_update_schema(MEModelCalibrationResultCreate, "MEModelCalibrationResultUpdate")
-]
+MEModelCalibrationResultUpdate = make_update_schema(
+    MEModelCalibrationResultCreate, "MEModelCalibrationResultUpdate"
+)  # pyright: ignore [reportInvalidTypeForm]
diff --git a/app/schemas/morphology.py b/app/schemas/morphology.py
@@ -1,5 +1,4 @@
 import uuid
-from typing import Annotated
 
 from pydantic import BaseModel, ConfigDict
 
@@ -42,9 +41,9 @@ class ReconstructionMorphologyCreate(
     legacy_id: list[str] | None = None
 
 
-ReconstructionMorphologyUpdate = Annotated[
-    BaseModel, make_update_schema(ReconstructionMorphologyCreate, "ReconstructionMorphologyUpdate")
-]
+ReconstructionMorphologyUpdate = make_update_schema(
+    ReconstructionMorphologyCreate, "ReconstructionMorphologyUpdate"
+)  # pyright: ignore [reportInvalidTypeForm]
 
 
 class ReconstructionMorphologyRead(
diff --git a/app/schemas/simulation.py b/app/schemas/simulation.py
@@ -1,5 +1,4 @@
 import uuid
-from typing import Annotated
 
 from pydantic import BaseModel, ConfigDict
 
@@ -38,9 +37,9 @@ class SingleNeuronSimulationCreate(
     me_model_id: uuid.UUID
 
 
-SingleNeuronSimulationUpdate = Annotated[
-    BaseModel, make_update_schema(SingleNeuronSimulationCreate, "SingleNeuronSimulationUpdate")
-]
+SingleNeuronSimulationUpdate = make_update_schema(
+    SingleNeuronSimulationCreate, "SingleNeuronSimulationUpdate"
+)  # pyright: ignore [reportInvalidTypeForm]
 
 
 class SingleNeuronSimulationRead(
@@ -64,12 +63,9 @@ class SingleNeuronSynaptomeSimulationCreate(
     synaptome_id: uuid.UUID
 
 
-SingleNeuronSynaptomeSimulationUpdate = Annotated[
-    BaseModel,
-    make_update_schema(
-        SingleNeuronSynaptomeSimulationCreate, "SingleNeuronSynaptomeSimulationUpdate"
-    ),
-]
+SingleNeuronSynaptomeSimulationUpdate = make_update_schema(
+    SingleNeuronSynaptomeSimulationCreate, "SingleNeuronSynaptomeSimulationUpdate"
+)  # pyright: ignore [reportInvalidTypeForm]
 
 
 class SingleNeuronSynaptomeSimulationRead(
@@ -98,7 +94,7 @@ class SimulationCreate(SimulationBase, AuthorizationOptionalPublicMixin):
     pass
 
 
-SimulationUpdate = Annotated[BaseModel, make_update_schema(SimulationCreate, "SimulationUpdate")]
+SimulationUpdate = make_update_schema(SimulationCreate, "SimulationUpdate")  # pyright: ignore [reportInvalidTypeForm]
 
 
 class NestedSimulationRead(SimulationBase, EntityTypeMixin, IdentifiableMixin):
diff --git a/app/schemas/simulation_campaign.py b/app/schemas/simulation_campaign.py
@@ -1,5 +1,4 @@
 import uuid
-from typing import Annotated
 
 from pydantic import BaseModel, ConfigDict
 
@@ -29,9 +28,7 @@ class SimulationCampaignCreate(SimulationCampaignBase, AuthorizationOptionalPubl
     pass
 
 
-SimulationCampaignUpdate = Annotated[
-    BaseModel, make_update_schema(SimulationCampaignCreate, "SimulationCampaignUpdate")
-]
+SimulationCampaignUpdate = make_update_schema(SimulationCampaignCreate, "SimulationCampaignUpdate")  # pyright: ignore [reportInvalidTypeForm]
 
 
 class NestedSimulationCampaignRead(SimulationCampaignBase, EntityTypeMixin, IdentifiableMixin):
diff --git a/app/schemas/simulation_result.py b/app/schemas/simulation_result.py
@@ -1,5 +1,4 @@
 import uuid
-from typing import Annotated
 
 from pydantic import BaseModel, ConfigDict
 
@@ -26,9 +25,7 @@ class SimulationResultCreate(SimulationResultBase, AuthorizationOptionalPublicMi
     pass
 
 
-SimulationResultUpdate = Annotated[
-    BaseModel, make_update_schema(SimulationResultCreate, "SimulationResultUpdate")
-]
+SimulationResultUpdate = make_update_schema(SimulationResultCreate, "SimulationResultUpdate")  # pyright: ignore [reportInvalidTypeForm]
 
 
 class NestedSimulationResultRead(SimulationResultBase, EntityTypeMixin, IdentifiableMixin):
diff --git a/app/schemas/subject.py b/app/schemas/subject.py
@@ -79,7 +79,7 @@ class SubjectCreate(AuthorizationOptionalPublicMixin, SubjectBase):
     species_id: uuid.UUID
 
 
-SubjectUpdate = Annotated[BaseModel, make_update_schema(SubjectCreate, "SubjectUpdate")]
+SubjectUpdate = make_update_schema(SubjectCreate, "SubjectUpdate")  # pyright: ignore [reportInvalidTypeForm]
 
 
 class NestedSubjectRead(SubjectBase, IdentifiableMixin):
diff --git a/app/schemas/synaptome.py b/app/schemas/synaptome.py
@@ -1,5 +1,4 @@
 import uuid
-from typing import Annotated
 
 from pydantic import BaseModel, ConfigDict
 
@@ -33,9 +32,9 @@ class SingleNeuronSynaptomeCreate(
     brain_region_id: uuid.UUID
 
 
-SingleNeuronSynaptomeUpdate = Annotated[
-    BaseModel, make_update_schema(SingleNeuronSynaptomeCreate, "SingleNeuronSynaptomeUpdate")
-]
+SingleNeuronSynaptomeUpdate = make_update_schema(
+    SingleNeuronSynaptomeCreate, "SingleNeuronSynaptomeUpdate"
+)  # pyright: ignore [reportInvalidTypeForm]
 
 
 class NestedSynaptome(SingleNeuronSynaptomeBase, CreationMixin, IdentifiableMixin):
diff --git a/app/schemas/utils.py b/app/schemas/utils.py
@@ -8,7 +8,7 @@
 }
 
 
-def make_update_schema(schema: type[BaseModel], new_schema_name: str) -> type[BaseModel]:
+def make_update_schema(schema: type[BaseModel], new_schema_name: str):
     """Create a new pydantic schema from current schema where all fields are optional.
 
     In order to differentiate between the user providing a None value and an actual not set by the
diff --git a/app/schemas/validation.py b/app/schemas/validation.py
@@ -1,5 +1,4 @@
 import uuid
-from typing import Annotated
 
 from pydantic import BaseModel
 
@@ -48,6 +47,4 @@ class ValidationResultCreate(ValidationResultBase, AuthorizationOptionalPublicMi
     pass
 
 
-ValidationResultUpdate = Annotated[
-    BaseModel, make_update_schema(ValidationResultCreate, "ValidationResultUpdate")
-]
+ValidationResultUpdate = make_update_schema(ValidationResultCreate, "ValidationResultUpdate")  # pyright: ignore [reportInvalidTypeForm]
diff --git a/app/service/calibration.py b/app/service/calibration.py
@@ -153,7 +153,7 @@ def delete_one(
 def update_one(
     db: SessionDep,
     id_: uuid.UUID,
-    json_model: CalibrationUpdate,
+    json_model: CalibrationUpdate,  # pyright: ignore [reportInvalidTypeForm]
     user_context: UserContextWithProjectIdDep,
 ) -> CalibrationRead:
     return router_update_activity_one(
diff --git a/app/service/circuit.py b/app/service/circuit.py
@@ -85,7 +85,7 @@ def update_one(
     user_context: UserContextDep,
     db: SessionDep,
     id_: uuid.UUID,
-    json_model: CircuitUpdate,
+    json_model: CircuitUpdate,  # pyright: ignore [reportInvalidTypeForm]
 ) -> CircuitRead:
     return router_update_one(
         id_=id_,
diff --git a/app/service/electrical_cell_recording.py b/app/service/electrical_cell_recording.py
@@ -153,7 +153,7 @@ def update_one(
     user_context: UserContextDep,
     db: SessionDep,
     id_: uuid.UUID,
-    json_model: ElectricalCellRecordingUpdate,
+    json_model: ElectricalCellRecordingUpdate,  # pyright: ignore [reportInvalidTypeForm]
 ) -> ElectricalCellRecordingRead:
     return router_update_one(
         id_=id_,
diff --git a/app/service/electrical_recording_stimulus.py b/app/service/electrical_recording_stimulus.py
@@ -77,7 +77,7 @@ def update_one(
     user_context: UserContextDep,
     db: SessionDep,
     id_: uuid.UUID,
-    json_model: ElectricalRecordingStimulusUpdate,
+    json_model: ElectricalRecordingStimulusUpdate,  # pyright: ignore [reportInvalidTypeForm]
 ) -> ElectricalRecordingStimulusRead:
     return router_update_one(
         id_=id_,
diff --git a/app/service/emodel.py b/app/service/emodel.py
@@ -94,7 +94,7 @@ def update_one(
     user_context: UserContextDep,
     db: SessionDep,
     id_: uuid.UUID,
-    json_model: EModelUpdate,
+    json_model: EModelUpdate,  # pyright: ignore [reportInvalidTypeForm]
 ) -> EModelRead:
     return router_update_one(
         id_=id_,
diff --git a/app/service/experimental_bouton_density.py b/app/service/experimental_bouton_density.py
@@ -153,7 +153,7 @@ def update_one(
     user_context: UserContextDep,
     db: SessionDep,
     id_: uuid.UUID,
-    json_model: ExperimentalBoutonDensityUpdate,
+    json_model: ExperimentalBoutonDensityUpdate,  # pyright: ignore [reportInvalidTypeForm]
 ) -> ExperimentalBoutonDensityRead:
     return router_update_one(
         id_=id_,
diff --git a/app/service/experimental_neuron_density.py b/app/service/experimental_neuron_density.py
@@ -156,7 +156,7 @@ def update_one(
     user_context: UserContextDep,
     db: SessionDep,
     id_: uuid.UUID,
-    json_model: ExperimentalNeuronDensityUpdate,
+    json_model: ExperimentalNeuronDensityUpdate,  # pyright: ignore [reportInvalidTypeForm]
 ) -> ExperimentalNeuronDensityRead:
     return router_update_one(
         id_=id_,
diff --git a/app/service/experimental_synapses_per_connection.py b/app/service/experimental_synapses_per_connection.py
@@ -179,7 +179,7 @@ def update_one(
     user_context: UserContextDep,
     db: SessionDep,
     id_: uuid.UUID,
-    json_model: ExperimentalSynapsesPerConnectionUpdate,
+    json_model: ExperimentalSynapsesPerConnectionUpdate,  # pyright: ignore [reportInvalidTypeForm]
 ) -> ExperimentalSynapsesPerConnectionRead:
     return router_update_one(
         id_=id_,
diff --git a/app/service/ion_channel_model.py b/app/service/ion_channel_model.py
@@ -155,7 +155,7 @@ def update_one(
     user_context: UserContextDep,
     db: SessionDep,
     id_: uuid.UUID,
-    json_model: IonChannelModelUpdate,
+    json_model: IonChannelModelUpdate,  # pyright: ignore [reportInvalidTypeForm]
 ) -> IonChannelModelRead:
     return router_update_one(
         id_=id_,
diff --git a/app/service/memodel.py b/app/service/memodel.py
@@ -112,7 +112,7 @@ def update_one(
     user_context: UserContextDep,
     db: SessionDep,
     id_: uuid.UUID,
-    json_model: MEModelUpdate,
+    json_model: MEModelUpdate,  # pyright: ignore [reportInvalidTypeForm]
 ) -> MEModelRead:
     return router_update_one(
         id_=id_,
diff --git a/app/service/memodel_calibration_result.py b/app/service/memodel_calibration_result.py
@@ -66,7 +66,7 @@ def update_one(
     user_context: UserContextDep,
     db: SessionDep,
     id_: uuid.UUID,
-    json_model: MEModelCalibrationResultUpdate,
+    json_model: MEModelCalibrationResultUpdate,  # pyright: ignore [reportInvalidTypeForm]
 ) -> MEModelCalibrationResultRead:
     return router_update_one(
         id_=id_,
diff --git a/app/service/morphology.py b/app/service/morphology.py
@@ -114,7 +114,7 @@ def update_one(
     user_context: UserContextDep,
     db: SessionDep,
     id_: uuid.UUID,
-    json_model: ReconstructionMorphologyUpdate,
+    json_model: ReconstructionMorphologyUpdate,  # pyright: ignore [reportInvalidTypeForm]
 ) -> ReconstructionMorphologyRead:
     return router_update_one(
         id_=id_,
diff --git a/app/service/simulation.py b/app/service/simulation.py
diff --git a/app/service/simulation_campaign.py b/app/service/simulation_campaign.py
diff --git a/app/service/simulation_execution.py b/app/service/simulation_execution.py
diff --git a/app/service/simulation_generation.py b/app/service/simulation_generation.py
diff --git a/app/service/simulation_result.py b/app/service/simulation_result.py
diff --git a/app/service/single_neuron_simulation.py b/app/service/single_neuron_simulation.py
diff --git a/app/service/single_neuron_synaptome.py b/app/service/single_neuron_synaptome.py
diff --git a/app/service/single_neuron_synaptome_simulation.py b/app/service/single_neuron_synaptome_simulation.py
diff --git a/app/service/subject.py b/app/service/subject.py
diff --git a/app/service/validation.py b/app/service/validation.py
diff --git a/app/service/validation_result.py b/app/service/validation_result.py
