folio-migration-tools 1.9.0a6__tar.gz → 1.9.0a7__tar.gz

{folio_migration_tools-1.9.0a6 → folio_migration_tools-1.9.0a7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: folio_migration_tools
-Version: 1.9.0a6
+Version: 1.9.0a7
 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

{folio_migration_tools-1.9.0a6 → folio_migration_tools-1.9.0a7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "folio_migration_tools"
-version = "1.9.0a6"
+version = "1.9.0a7"
 description =  "A tool allowing you to migrate data from legacy ILS:s (Library systems) into FOLIO LSP"
 authors = ["Theodor Tolstoy <github.teddes@tolstoy.se>", "Lisa Sjögren", "Brooks Travis", "Jeremy Nelson", "Clinton Bradford"]
 license = "MIT"

{folio_migration_tools-1.9.0a6 → folio_migration_tools-1.9.0a7}/src/folio_migration_tools/__main__.py

@@ -3,6 +3,7 @@ import logging
 import sys
 from os import environ
 from pathlib import Path
+from sqlite3 import connect
 
 import httpx
 import humps
@@ -124,7 +125,8 @@ def main():
         except TransformationProcessError as tpe:
             logging.critical(tpe.message)
             print(f"\n{tpe.message}: {tpe.data_value}")
-            sys.exit("Transformation Failure")
+            print("Task failure. Halting.")
+            sys.exit(1)
         logging.info("Work done. Shutting down")
         sys.exit(0)
     except json.decoder.JSONDecodeError as json_error:
@@ -148,10 +150,17 @@ def main():
         print("Halting")
         sys.exit("JSON Not Matching Spec")
     except httpx.HTTPError as connection_error:
-        print(
-            f"\nConnection Error when connecting to {connection_error.request.url}. "
-            "Are you connectet to the Internet/VPN? Do you need to update DNS settings?"
-        )
+        if hasattr(connection_error, "response"):
+            print(
+                f"\nHTTP Error when connecting to {connection_error.request.url}. "
+                f"Status code: {connection_error.response.status_code}. "
+                f"\nResponse: {connection_error.response.text}"
+            )
+        else:
+            print(
+                f"\nConnection Error when connecting to {connection_error.request.url}. "
+                "Are you connected to the Internet/VPN? Do you need to update DNS settings?"
+            )
         sys.exit("HTTP Not Connecting")
     except FileNotFoundError as fnf_error:
         print(f"\n{fnf_error.strerror}: {fnf_error.filename}")

{folio_migration_tools-1.9.0a6 → folio_migration_tools-1.9.0a7}/src/folio_migration_tools/library_configuration.py

@@ -62,14 +62,9 @@ class IlsFlavour(str, Enum):
 
 
 class FolioRelease(str, Enum):
-    lotus = "lotus"
-    morning_glory = "morning-glory"
-    nolana = "nolana"
-    orchid = "orchid"
-    poppy = "poppy"
-    quesnelia = "quesnelia"
     ramsons = "ramsons"
     sunflower = "sunflower"
+    trillium = "trillium"
 
 
 class LibraryConfiguration(BaseModel):

{folio_migration_tools-1.9.0a6 → folio_migration_tools-1.9.0a7}/src/folio_migration_tools/mapper_base.py

@@ -444,7 +444,7 @@ class MapperBase:
                     except IndexError:
                         if call_numbers:
                             bound_with_holding["callNumber"] = call_numbers[0]
-                    except SyntaxError:
+                    except (SyntaxError, ValueError):
                         bound_with_holding["callNumber"] = call_number
                 else:
                     bound_with_holding["callNumber"] = call_number

{folio_migration_tools-1.9.0a6 → folio_migration_tools-1.9.0a7}/src/folio_migration_tools/migration_tasks/batch_poster.py

@@ -5,6 +5,7 @@ import sys
 import time
 import traceback
 from datetime import datetime
+from math import log
 from typing import Annotated, List
 from uuid import uuid4
 
@@ -136,12 +137,12 @@ class BatchPoster(MigrationTaskBase):
     def do_work(self):
         with self.folio_client.get_folio_http_client() as httpx_client:
             self.http_client = httpx_client
-            try:
-                batch = []
-                if self.task_configuration.object_type == "SRS":
-                    self.create_snapshot()
-                with open(self.folder_structure.failed_recs_path, "w") as failed_recs_file:
-                    for file_def in self.task_configuration.files:
+            with open(self.folder_structure.failed_recs_path, "w", encoding='utf-8') as failed_recs_file:
+                try:
+                    batch = []
+                    if self.task_configuration.object_type == "SRS":
+                        self.create_snapshot()
+                    for idx, file_def in enumerate(self.task_configuration.files):
                         path = self.folder_structure.results_folder / file_def.file_name
                         with open(path) as rows:
                             logging.info("Running %s", path)
@@ -172,9 +173,8 @@ class BatchPoster(MigrationTaskBase):
                                             self.processed,
                                             failed_recs_file,
                                         )
-                                        logging.critical("Halting %s", tpe)
-                                        print(f"\n\t{tpe.message}")
-                                        sys.exit(1)
+                                        batch = []
+                                        raise
                                     except TransformationRecordFailedError as exception:
                                         self.handle_generic_exception(
                                             exception,
@@ -184,7 +184,21 @@ class BatchPoster(MigrationTaskBase):
                                             failed_recs_file,
                                         )
                                         batch = []
-
+                                    except (FileNotFoundError, PermissionError) as ose:
+                                        logging.error("Error reading file: %s", ose)
+
+                except Exception as ee:
+                    if "idx" in locals() and self.task_configuration.files[idx:]:
+                        for file in self.task_configuration.files[idx:]:
+                            try:
+                                with open(file, "r") as failed_file:
+                                    failed_file.seek(self.processed)
+                                    failed_recs_file.write(failed_file.read())
+                                    self.processed = 0
+                            except (FileNotFoundError, PermissionError) as ose:
+                                logging.error("Error reading file: %s", ose)
+                    raise ee
+                finally:
                     if self.task_configuration.object_type != "Extradata" and any(batch):
                         try:
                             self.post_batch(batch, failed_recs_file, self.processed)
@@ -193,10 +207,8 @@ class BatchPoster(MigrationTaskBase):
                                 exception, last_row, batch, self.processed, failed_recs_file
                             )
                     logging.info("Done posting %s records. ", (self.processed))
-            except Exception as ee:
-                if self.task_configuration.object_type == "SRS":
-                    self.commit_snapshot()
-                raise ee
+                    if self.task_configuration.object_type == "SRS":
+                        self.commit_snapshot()
 
     def post_record_batch(self, batch, failed_recs_file, row):
         json_rec = json.loads(row.split("\t")[-1])
@@ -339,6 +351,10 @@ class BatchPoster(MigrationTaskBase):
 
     def post_batch(self, batch, failed_recs_file, num_records, recursion_depth=0):
         response = self.do_post(batch)
+        if response.status_code == 401:
+            logging.error("Authorization failed (%s). Fetching new auth token...", response.text)
+            self.folio_client.login()
+            response = self.do_post(batch)
         if response.status_code == 201:
             logging.info(
                 (

{folio_migration_tools-1.9.0a6 → folio_migration_tools-1.9.0a7}/src/folio_migration_tools/migration_tasks/loans_migrator.py

@@ -8,11 +8,11 @@ import traceback
 from datetime import datetime, timedelta
 from typing import Optional
 from urllib.error import HTTPError
+from zoneinfo import ZoneInfo
 
 import i18n
 from dateutil import parser as du_parser
 from folio_uuid.folio_namespaces import FOLIONamespaces
-from zoneinfo import ZoneInfo
 
 from folio_migration_tools.circulation_helper import CirculationHelper
 from folio_migration_tools.helper import Helper
@@ -131,34 +131,13 @@ class LoansMigrator(MigrationTaskBase):
         logging.info("Init completed")
 
     def check_smtp_config(self):
-        if self.library_configuration.folio_release.lower() == FolioRelease.morning_glory:
-            logging.warn("DEPRECATED: Morning Glory support will be removed in a future release!")
-            okapi_config_base_path = "/configurations/entries"
-            okapi_config_query = "(module=={}%20and%20configName=={}%20and%20code=={})"
-            okapi_config_limit = 1000
-            okapi_config_module = "SMTP_SERVER"
-            okapi_config_name = "smtp"
-            okapi_config_code = "EMAIL_SMTP_HOST_DISABLED"
-            smtp_config_path = (
-                okapi_config_base_path
-                + "?"
-                + str(okapi_config_limit)
-                + "&query="
-                + okapi_config_query.format(
-                    okapi_config_module, okapi_config_name, okapi_config_code
-                )
-            )
-            smtp_config_disabled = self.folio_client.folio_get_single_object(smtp_config_path)[
-                "configs"
-            ]
-        else:
-            try:
-                smtp_config = self.folio_client.folio_get_single_object("/smtp-configuration")[
-                    "smtpConfigurations"
-                ][0]
-                smtp_config_disabled = "disabled" in smtp_config["host"].lower()
-            except IndexError:
-                smtp_config_disabled = True
+        try:
+            smtp_config = self.folio_client.folio_get_single_object("/smtp-configuration")[
+                "smtpConfigurations"
+            ][0]
+            smtp_config_disabled = "disabled" in smtp_config["host"].lower()
+        except IndexError:
+            smtp_config_disabled = True
         print_smtp_warning()
         if not smtp_config_disabled:
             logging.warn("SMTP connection not disabled...")