From 490224368750549008018fa81ac1db43502484c1 Mon Sep 17 00:00:00 2001 From: bruno-f-cruz <7049351+bruno-f-cruz@users.noreply.github.com> Date: Sun, 21 Jul 2024 18:54:17 -0700 Subject: [PATCH] Linting --- scripts/regenerate.py | 5 +---- src/DataSchemas/aind_behavior_services/base.py | 1 - src/DataSchemas/aind_behavior_services/launcher.py | 3 --- .../aind_behavior_services/task_logic/__init__.py | 1 - src/DataSchemas/aind_behavior_services/utils.py | 4 ---- tests/test_bonsai.py | 2 -- tests/test_examples.py | 2 +- tests/test_launcher.py | 3 --- tests/test_schema_version_coercion.py | 2 -- 9 files changed, 2 insertions(+), 21 deletions(-) diff --git a/scripts/regenerate.py b/scripts/regenerate.py index 30f25688..d5264528 100644 --- a/scripts/regenerate.py +++ b/scripts/regenerate.py @@ -48,10 +48,7 @@ def main(): namespace=f"{NAMESPACE_PREFIX}.AindBehaviorSession", ) - convert_pydantic_to_bonsai( - {"aind_behavior_data_types": DataTypes}, - schema_path=SCHEMA_ROOT, skip_sgen=True - ) + convert_pydantic_to_bonsai({"aind_behavior_data_types": DataTypes}, schema_path=SCHEMA_ROOT, skip_sgen=True) convert_pydantic_to_bonsai( {"aind_behavior_subject_database": db_utils.SubjectDataBase}, diff --git a/src/DataSchemas/aind_behavior_services/base.py b/src/DataSchemas/aind_behavior_services/base.py index 6f5aafd4..f819d5ba 100644 --- a/src/DataSchemas/aind_behavior_services/base.py +++ b/src/DataSchemas/aind_behavior_services/base.py @@ -53,7 +53,6 @@ def __get_pydantic_json_schema__( def coerce_schema_version(cls: BaseModel, v: str) -> str: - try: # Get the default schema version from the model literal field _default_schema_version = Version.parse(get_args(cls.model_fields["version"].annotation)[0]) except IndexError: # This handles the case where the base class does not define a literal schema_version value diff --git a/src/DataSchemas/aind_behavior_services/launcher.py b/src/DataSchemas/aind_behavior_services/launcher.py index 97b48791..464ff0bb 100644 --- a/src/DataSchemas/aind_behavior_services/launcher.py +++ b/src/DataSchemas/aind_behavior_services/launcher.py @@ -514,7 +514,6 @@ def _make_folder(folder: os.PathLike | str) -> None: class LauncherCli(Generic[TRig, TSession, TTaskLogic]): - def __init__( self, rig_schema: Type[TRig], @@ -527,7 +526,6 @@ def __init__( repository_dir: Optional[os.PathLike | str] = None, **launcher_kwargs, ) -> None: - parser = self._get_default_arg_parser() args, _ = parser.parse_known_args() @@ -577,7 +575,6 @@ def _validate_dependencies(self) -> None: @staticmethod def _get_default_arg_parser() -> argparse.ArgumentParser: - parser = argparse.ArgumentParser() parser.add_argument("--data_dir", help="Specify the data directory") diff --git a/src/DataSchemas/aind_behavior_services/task_logic/__init__.py b/src/DataSchemas/aind_behavior_services/task_logic/__init__.py index 1eec70b9..1efea31b 100644 --- a/src/DataSchemas/aind_behavior_services/task_logic/__init__.py +++ b/src/DataSchemas/aind_behavior_services/task_logic/__init__.py @@ -11,7 +11,6 @@ class TaskParameters(curriculum_task.TaskParameters): class AindBehaviorTaskLogicModel(curriculum_task.Task): - task_parameters: TaskParameters = Field(..., description="Parameters of the task logic", validate_default=True) version: str = Field(..., pattern=curriculum_task.SEMVER_REGEX, description="task schema version") diff --git a/src/DataSchemas/aind_behavior_services/utils.py b/src/DataSchemas/aind_behavior_services/utils.py index 7c9405dc..7c95c7b1 100644 --- a/src/DataSchemas/aind_behavior_services/utils.py +++ b/src/DataSchemas/aind_behavior_services/utils.py @@ -247,7 +247,6 @@ def convert_pydantic_to_bonsai( skip_sgen: bool = False, export_schema_kwargs: Dict[str, Any] = {}, ) -> Dict[str, Optional[CompletedProcess]]: - def _write_json(schema_path: PathLike, output_model_name: str, model: ModelInputTypeSignature) -> None: with open(os.path.join(schema_path, f"{output_model_name}.json"), "w", encoding="utf-8") as f: json_model = export_schema(model, **export_schema_kwargs) @@ -325,7 +324,6 @@ def _build_bonsai_process_command( layout: Optional[PathLike | str] = None, additional_properties: Optional[Dict[str, str]] = None, ) -> str: - output_cmd: str = f'"{bonsai_exe}" "{workflow_file}"' if is_editor_mode: if is_start_flag: @@ -353,7 +351,6 @@ def run_bonsai_process( timeout: Optional[float] = None, print_cmd: bool = False, ) -> CompletedProcess: - output_cmd = _build_bonsai_process_command( workflow_file=workflow_file, bonsai_exe=bonsai_exe, @@ -381,7 +378,6 @@ def open_bonsai_process( creation_flags: Optional[int] = None, print_cmd: bool = False, ) -> subprocess.Popen: - output_cmd = _build_bonsai_process_command( workflow_file=workflow_file, bonsai_exe=bonsai_exe, diff --git a/tests/test_bonsai.py b/tests/test_bonsai.py index fd27122e..61b292e0 100644 --- a/tests/test_bonsai.py +++ b/tests/test_bonsai.py @@ -9,9 +9,7 @@ class BonsaiTests(unittest.TestCase): - def test_deserialization(self): - tested_modules = [ "aind_manipulator", "load_cells", diff --git a/tests/test_examples.py b/tests/test_examples.py index 22547964..412b8c52 100644 --- a/tests/test_examples.py +++ b/tests/test_examples.py @@ -1,4 +1,4 @@ -""" testing examples """ +"""testing examples""" import glob import unittest diff --git a/tests/test_launcher.py b/tests/test_launcher.py index d8799ca3..11ba8bc1 100644 --- a/tests/test_launcher.py +++ b/tests/test_launcher.py @@ -10,9 +10,7 @@ class LauncherTests(unittest.TestCase): - def test_instance(self): - __version__ = "0.1.0" class AindGenericTaskRig(AindBehaviorRigModel): @@ -38,7 +36,6 @@ class AindGenericTaskTaskLogic(AindBehaviorTaskLogicModel): self.assertTrue("This is broken" in context.exception) def test_launcher_cli(self): - __version__ = "0.1.0" class AindGenericTaskRig(AindBehaviorRigModel): diff --git a/tests/test_schema_version_coercion.py b/tests/test_schema_version_coercion.py index ebcd4a90..eb08a8cc 100644 --- a/tests/test_schema_version_coercion.py +++ b/tests/test_schema_version_coercion.py @@ -23,9 +23,7 @@ class AindBehaviorRigModelPost(AindBehaviorTaskLogicModel): class SchemaVersionCoercionTest(unittest.TestCase): - def test_version_update_coercion(self): - pre_instance = AindBehaviorRigModelPre() post_instance = AindBehaviorRigModelPost() with warnings.catch_warnings():