folio-migration-tools 1.9.0rc11__tar.gz → 1.9.0rc12__tar.gz

{folio_migration_tools-1.9.0rc11 → folio_migration_tools-1.9.0rc12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: folio_migration_tools
-Version: 1.9.0rc11
+Version: 1.9.0rc12
 Summary: A tool allowing you to migrate data from legacy ILS:s (Library systems) into FOLIO LSP
 License: MIT
 Keywords: FOLIO,ILS,LSP,Library Systems,MARC21,Library data
@@ -20,7 +20,7 @@ Requires-Dist: art (>=6.5,<7.0)
 Requires-Dist: deepdiff (>=6.2.3,<7.0.0)
 Requires-Dist: defusedxml (>=0.7.1,<0.8.0)
 Requires-Dist: folio-uuid (>=0.2.8,<0.3.0)
-Requires-Dist: folioclient (==0.70.1)
+Requires-Dist: folioclient (>=0.70.1,<0.71.0)
 Requires-Dist: pyaml (>=21.10.1,<22.0.0)
 Requires-Dist: pydantic (>=1.10.2,<2.0.0)
 Requires-Dist: pyhumps (>=3.7.3,<4.0.0)

{folio_migration_tools-1.9.0rc11 → folio_migration_tools-1.9.0rc12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "folio_migration_tools"
-version = "1.9.0rc11"
+version = "1.9.0rc12"
 description =  "A tool allowing you to migrate data from legacy ILS:s (Library systems) into FOLIO LSP"
 authors = [
 	{name = "Theodor Tolstoy", email = "github.teddes@tolstoy.se"},
@@ -44,7 +44,7 @@ profile = "black"
 
 [tool.poetry.dependencies]
 python = "^3.9"
-folioclient = "0.70.1"
+folioclient = "^0.70.1"
 pyhumps = "^3.7.3"
 defusedxml = "^0.7.1"
 python-dateutil = "^2.8.2"

{folio_migration_tools-1.9.0rc11 → folio_migration_tools-1.9.0rc12}/src/folio_migration_tools/__main__.py

@@ -157,7 +157,6 @@ def main():
             print("Task failure. Halting.")
             sys.exit(1)
         logging.info("Work done. Shutting down")
-        sys.exit(0)
     except json.decoder.JSONDecodeError as json_error:
         logging.critical(json_error)
         print(json_error.doc)
@@ -198,7 +197,7 @@ def main():
         logging.exception("Unhandled exception")
         print(f"\n{ee}")
         sys.exit(ee.__class__.__name__)
-
+    sys.exit(0)
 
 def inheritors(base_class):
     subclasses = set()

{folio_migration_tools-1.9.0rc11 → folio_migration_tools-1.9.0rc12}/src/folio_migration_tools/mapping_file_transformation/organization_mapper.py

@@ -79,28 +79,28 @@ class OrganizationMapper(MappingFileMapperBase):
                 False,
             )
 
-        elif re.compile("addresses\[(\d+)\]\.categories\[(\d+)\]").fullmatch(folio_prop_name):
+        elif re.compile(r"addresses\[(\d+)\]\.categories\[(\d+)\]").fullmatch(folio_prop_name):
             return self.get_mapped_ref_data_value(
                 self.address_categories_map,
                 *value_tuple,
                 False,
             )
 
-        elif re.compile("emails\[(\d+)\]\.categories\[(\d+)\]").fullmatch(folio_prop_name):
+        elif re.compile(r"emails\[(\d+)\]\.categories\[(\d+)\]").fullmatch(folio_prop_name):
             return self.get_mapped_ref_data_value(
                 self.email_categories_map,
                 *value_tuple,
                 False,
             )
 
-        elif re.compile("phoneNumbers\[(\d+)\]\.categories\[(\d+)\]").fullmatch(folio_prop_name):
+        elif re.compile(r"phoneNumbers\[(\d+)\]\.categories\[(\d+)\]").fullmatch(folio_prop_name):
             return self.get_mapped_ref_data_value(
                 self.phone_categories_map,
                 *value_tuple,
                 False,
             )
 
-        elif re.compile("interfaces\[(\d+)\]\.interfaceCredential.interfaceId").fullmatch(
+        elif re.compile(r"interfaces\[(\d+)\]\.interfaceCredential.interfaceId").fullmatch(
             folio_prop_name
         ):
             return "replace_with_interface_id"

{folio_migration_tools-1.9.0rc11 → folio_migration_tools-1.9.0rc12}/src/folio_migration_tools/marc_rules_transformation/holdings_statementsparser.py

@@ -165,23 +165,16 @@ class HoldingsStatementsParser:
             TransformationFieldMappingError: _description_
         """
         for f in marc_record.get_fields(field_textual):
-            codes = [sf.code for sf in f.subfields]
-            if "a" not in codes and "z" not in codes and "x" not in codes:
-                raise TransformationFieldMappingError(
-                    legacy_ids,
-                    i18n.t(
-                        "%{field} subfields a, x, and z missing from field", field=field_textual
-                    ),
-                    f,
-                )
-            if not (
-                len(f.get_subfields("a")) == 0
-                or len(f.get_subfields("z")) == 0
-                or len(f.get_subfields("x")) == 0
+            if all(
+                [
+                    len("".join(f.get_subfields("a")).strip()) == 0,
+                    len("".join(f.get_subfields("z")).strip()) == 0,
+                    len("".join(f.get_subfields("x")).strip()) == 0,
+                ]
             ):
                 raise TransformationFieldMappingError(
                     legacy_ids,
-                    i18n.t("%{field} a,x and z are all empty", field=field_textual),
+                    i18n.t("%{field} a, x and z are missing or empty", field=field_textual),
                     f,
                 )
             return_dict["statements"].append(

{folio_migration_tools-1.9.0rc11 → folio_migration_tools-1.9.0rc12}/src/folio_migration_tools/marc_rules_transformation/rules_mapper_bibs.py

@@ -10,7 +10,6 @@ from pathlib import Path
 from typing import Dict, Generator, List
 
 import i18n
-import pymarc
 from defusedxml.ElementTree import fromstring
 from folio_uuid.folio_namespaces import FOLIONamespaces
 from folio_uuid.folio_uuid import FolioUUID
@@ -144,7 +143,7 @@ class BibsRulesMapper(RulesMapperBase):
         self.report_folio_mapping(clean_folio_instance, self.schema)
         return [clean_folio_instance]
 
-    def simple_bib_map(self, folio_instnace: dict, marc_record: Record, ignored_subsequent_fields: set, legacy_ids: List[str]):
+    def simple_bib_map(self, folio_instance: dict, marc_record: Record, ignored_subsequent_fields: set, legacy_ids: List[str]):
         """
         This method applies a much simplified MARC-to-instance
         mapping to create a minimal FOLIO Instance record to be
@@ -152,7 +151,7 @@ class BibsRulesMapper(RulesMapperBase):
         than creating SRS records during transformation.
 
         Args:
-            folio_instnace (dict): _description_
+            folio_instance (dict): _description_
             marc_record (Record): _description_
             legacy_ids (List[str]): _description_
             file_def (FileDefinition): _description_
@@ -169,9 +168,10 @@ class BibsRulesMapper(RulesMapperBase):
         if not main_entry_fields:
             main_entry_fields += marc_record.get_fields("700", "710", "711", "730")
             main_entry_fields.sort(key=lambda x: int(x.tag))
-        self.process_marc_field(folio_instnace, main_entry_fields[0], ignored_subsequent_fields, legacy_ids)
+        if main_entry_fields:
+            self.process_marc_field(folio_instance, main_entry_fields[0], ignored_subsequent_fields, legacy_ids)
         try:
-            self.process_marc_field(folio_instnace, marc_record['245'], ignored_subsequent_fields, legacy_ids)
+            self.process_marc_field(folio_instance, marc_record['245'], ignored_subsequent_fields, legacy_ids)
         except KeyError:
             raise TransformationRecordFailedError(
                 legacy_ids,

{folio_migration_tools-1.9.0rc11 → folio_migration_tools-1.9.0rc12}/src/folio_migration_tools/marc_rules_transformation/rules_mapper_holdings.py

@@ -39,7 +39,7 @@ class RulesMapperHoldings(RulesMapperBase):
         task_configuration,
         library_configuration: LibraryConfiguration,
         parent_id_map: dict,
-        boundwith_relationship_map,
+        boundwith_relationship_map_rows: List[Dict],
     ):
         self.task_configuration = task_configuration
         self.conditions = Conditions(
@@ -58,8 +58,8 @@ class RulesMapperHoldings(RulesMapperBase):
             self.conditions,
             parent_id_map,
         )
-        self.boundwith_relationship_map = self.setup_boundwith_relationship_map(
-            boundwith_relationship_map
+        self.boundwith_relationship_map: Dict = self.setup_boundwith_relationship_map(
+            boundwith_relationship_map_rows
         )
         self.location_map = self.validate_location_map(
             location_map,
@@ -402,20 +402,20 @@ class RulesMapperHoldings(RulesMapperBase):
             marc_record (Record): PyMARC record
             folio_holding (Dict): FOLIO holdings record
         """
-        holdings_note_type_tuple = self.conditions.get_ref_data_tuple_by_name(
-            self.folio.holding_note_types, "holding_note_types", self.task_configuration.mfhd_mrk_note_type
-        )
-        try:
-            holdings_note_type_id = holdings_note_type_tuple[0]
-        except Exception as ee:
-            logging.error(ee)
-            raise TransformationRecordFailedError(
-                legacy_ids,
-                f'Holdings note type mapping error.\tNote type name: {self.task_configuration.mfhd_mrk_note_type}\t'
-                f"Note type not found in FOLIO.",
-                self.task_configuration.mfhd_mrk_note_type,
-            ) from ee
         if self.task_configuration.include_mfhd_mrk_as_note:
+            holdings_note_type_tuple = self.conditions.get_ref_data_tuple_by_name(
+                self.folio.holding_note_types, "holding_note_types", self.task_configuration.mfhd_mrk_note_type
+            )
+            try:
+                holdings_note_type_id = holdings_note_type_tuple[0]
+            except Exception as ee:
+                logging.error(ee)
+                raise TransformationRecordFailedError(
+                    legacy_ids,
+                    f'Holdings note type mapping error.\tNote type name: {self.task_configuration.mfhd_mrk_note_type}\t'
+                    f"Note type not found in FOLIO.",
+                    self.task_configuration.mfhd_mrk_note_type,
+                ) from ee
             folio_holding["notes"] = folio_holding.get("notes", []) + [
                 {
                     "note": str(marc_record),
@@ -433,20 +433,20 @@ class RulesMapperHoldings(RulesMapperBase):
             marc_record (Record): PyMARC record
             folio_holding (Dict): FOLIO holdings record
         """
-        holdings_note_type_tuple = self.conditions.get_ref_data_tuple_by_name(
-            self.folio.holding_note_types, "holding_note_types", self.task_configuration.mfhd_mrc_note_type
-        )
-        try:
-            holdings_note_type_id = holdings_note_type_tuple[0]
-        except Exception as ee:
-            logging.error(ee)
-            raise TransformationRecordFailedError(
-                legacy_ids,
-                f'Holdings note type mapping error.\tNote type name: {self.task_configuration.mfhd_mrc_note_type}\t'
-                f"Note type not found in FOLIO.",
-                self.task_configuration.mfhd_mrc_note_type,
-            ) from ee
         if self.task_configuration.include_mfhd_mrc_as_note:
+            holdings_note_type_tuple = self.conditions.get_ref_data_tuple_by_name(
+                self.folio.holding_note_types, "holding_note_types", self.task_configuration.mfhd_mrc_note_type
+            )
+            try:
+                holdings_note_type_id = holdings_note_type_tuple[0]
+            except Exception as ee:
+                logging.error(ee)
+                raise TransformationRecordFailedError(
+                    legacy_ids,
+                    f'Holdings note type mapping error.\tNote type name: {self.task_configuration.mfhd_mrc_note_type}\t'
+                    f"Note type not found in FOLIO.",
+                    self.task_configuration.mfhd_mrc_note_type,
+                ) from ee
             folio_holding["notes"] = folio_holding.get("notes", []) + [
                 {
                     "note": marc_record.as_marc().decode("utf-8"),

{folio_migration_tools-1.9.0rc11 → folio_migration_tools-1.9.0rc12}/src/folio_migration_tools/migration_tasks/holdings_marc_transformer.py

@@ -242,19 +242,26 @@ class HoldingsMarcTransformer(MigrationTaskBase):
         )
 
         # Load Boundwith relationship map
-        self.boundwith_relationship_map = []
+        self.boundwith_relationship_map_rows = []
         if self.task_config.boundwith_relationship_file_path:
-            with open(
-                self.folder_structure.legacy_records_folder
-                / self.task_config.boundwith_relationship_file_path
-            ) as boundwith_relationship_file:
-                self.boundwith_relationship_map = list(
-                    csv.DictReader(boundwith_relationship_file, dialect="tsv")
+            try:
+                with open(
+                    self.folder_structure.legacy_records_folder
+                    / self.task_config.boundwith_relationship_file_path
+                ) as boundwith_relationship_file:
+                    self.boundwith_relationship_map_rows = list(
+                        csv.DictReader(boundwith_relationship_file, dialect="tsv")
+                    )
+                logging.info(
+                    "Rows in Bound with relationship map: %s",
+                    len(self.boundwith_relationship_map_rows),
+                )
+            except FileNotFoundError:
+                raise TransformationProcessError(
+                    "",
+                    i18n.t("Provided boundwith relationship file not found"),
+                    self.task_config.boundwith_relationship_file_path,
                 )
-            logging.info(
-                "Rows in Bound with relationship map: %s",
-                len(self.boundwith_relationship_map),
-            )
 
         location_map_path = (
             self.folder_structure.mapping_files_folder
@@ -274,7 +281,7 @@ class HoldingsMarcTransformer(MigrationTaskBase):
             self.task_config,
             self.library_configuration,
             self.instance_id_map,
-            self.boundwith_relationship_map,
+            self.boundwith_relationship_map_rows,
         )
         self.add_supplemental_mfhd_mappings()
         if (

{folio_migration_tools-1.9.0rc11 → folio_migration_tools-1.9.0rc12}/src/folio_migration_tools/transaction_migration/legacy_loan.py

@@ -1,5 +1,6 @@
 import json
 import logging
+import i18n
 from datetime import datetime
 from zoneinfo import ZoneInfo
 
@@ -123,7 +124,7 @@ class LegacyLoan(object):
             if self.out_date.hour == 0:
                 self.out_date = self.out_date.replace(hour=0, minute=1)
         if self.due_date <= self.out_date:
-            raise TransformationProcessError(self.row, "Due date is before out date, or date information is missing from both", json.dumps(self.legacy_loan_dict, indent=2))
+            raise TransformationProcessError(self.row, i18n.t("Due date is before out date, or date information is missing from both"), json.dumps(self.legacy_loan_dict, indent=2))
 
     def to_dict(self):
         return {

{folio_migration_tools-1.9.0rc11 → folio_migration_tools-1.9.0rc12}/src/folio_migration_tools/translations/en.json

@@ -3,7 +3,7 @@
   "%{action} error. http status: %{status}": "%{action} error. http status: %{status}",
   "%{action} error: %{message}": "%{action} error: %{message}",
   "%{fields_criteria} empty or not set": "%{fields_criteria} empty or not set",
-  "%{field} a,x and z are all empty": "%{field} a,x and z are all empty",
+  "%{field} a, x and z are missing or empty": "%{field} a, x and z are missing or empty",
   "%{field} subfields a, x, and z missing from field": "%{field} subfields a, x, and z missing from field",
   "%{fro} mapped from %{record}": "%{fro} mapped from %{record}",
   "%{props} were concatenated": "%{props} were concatenated",
@@ -441,5 +441,7 @@
   "legacy id from %{fro}": "legacy id from %{fro}",
   "naturalId mapped from %{fro}": "naturalId mapped from %{fro}",
   "no matching identifier_types in %{names}": "no matching identifier_types in %{names}",
-  "subfield present in %{linked_value_tag} but not in %{pattern_field}": "subfield present in %{linked_value_tag} but not in %{pattern_field}"
+  "subfield present in %{linked_value_tag} but not in %{pattern_field}": "subfield present in %{linked_value_tag} but not in %{pattern_field}",
+  "Provided boundwith relationship file not found": "Provided boundwith relationship file not found",
+  "Due date is before out date, or date information is missing from both": "Due date is before out date, or date information is missing from both"
 }