Remove invalid type-checking

UoA-eResearch · Dec 21, 2023 · 89eea7f · 89eea7f
1 parent 81b6500
commit 89eea7f
Showing 1 changed file with 6 additions and 25 deletions.
diff --git a/src/ingestion_factory/factory.py b/src/ingestion_factory/factory.py
@@ -153,15 +153,8 @@ def ingest_projects(
                 result.error.append(name)
                 continue
 
-            forged_project = self.forge.forge_project(
-                prepared_project, refined_parameters
-            )
-            # TODO: This is a temporary fix for TypeError.
-            # Might need to use isinstance() rather than type() for a typecheck.
-            if type(forged_project) == URI:
-                result.success.append((name, forged_project))
-            else:
-                result.success.append((name, None))
+            project_uri = self.forge.forge_project(prepared_project, refined_parameters)
+            result.success.append((name, project_uri))
 
         logger.info(
             "Successfully ingested %d projects: %s", len(result.success), result.success
@@ -210,15 +203,10 @@ def ingest_experiments(  # pylint: disable=too-many-locals
                 result.error.append(name)
                 continue
 
-            forged_experiment = self.forge.forge_experiment(
+            experiment_uri = self.forge.forge_experiment(
                 prepared_experiment, refined_parameters
             )
-            # TODO: This is a temporary fix for TypeError.
-            # Might need to use isinstance() rather than type() for a typecheck.
-            if type(forged_experiment) == URI:
-                result.success.append((name, forged_experiment))
-            else:
-                result.success.append((name, None))
+            result.success.append((name, experiment_uri))
 
         logger.info(
             "Successfully ingested %d experiments: %s",
@@ -267,15 +255,8 @@ def ingest_datasets(  # pylint: disable=too-many-locals
                 result.error.append(name)
                 continue
 
-            forged_dataset = self.forge.forge_dataset(
-                prepared_dataset, refined_parameters
-            )
-            # TODO: This is a temporary fix for TypeError.
-            # Might need to use isinstance() rather than type() for a typecheck.
-            if type(forged_dataset) == URI:
-                result.success.append((name, forged_dataset))
-            else:
-                result.success.append((name, None))
+            dataset_uri = self.forge.forge_dataset(prepared_dataset, refined_parameters)
+            result.success.append((name, dataset_uri))
 
         logger.info(
             "Successfully ingested %d datasets: %s", len(result.success), result.success