folio-migration-tools 1.10.0b4__tar.gz → 1.10.0b6__tar.gz

{folio_migration_tools-1.10.0b4 → folio_migration_tools-1.10.0b6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: folio-migration-tools
-Version: 1.10.0b4
+Version: 1.10.0b6
 Summary: A tool allowing you to migrate data from legacy ILS:s (Library systems) into FOLIO LSP
 Keywords: FOLIO,ILS,LSP,Library Systems,MARC21,Library data
 Author: Theodor Tolstoy, Lisa Sjögren, Brooks Travis, Jeremy Nelson, Clinton Bradford

{folio_migration_tools-1.10.0b4 → folio_migration_tools-1.10.0b6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "folio_migration_tools"
-version = "1.10.0b4"
+version = "1.10.0b6"
 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"},

{folio_migration_tools-1.10.0b4 → folio_migration_tools-1.10.0b6}/src/folio_migration_tools/mapping_file_transformation/user_mapper.py

@@ -115,6 +115,10 @@ class UserMapper(MappingFileMapperBase):
 
         if self.task_config.remove_request_preferences:
             del clean_folio_object["requestPreference"]
+
+        if self.task_config.remove_username:
+            del clean_folio_object["username"]
+
         self.report_folio_mapping_no_schema(clean_folio_object)
         self.report_legacy_mapping_no_schema(legacy_user)
 

{folio_migration_tools-1.10.0b4 → folio_migration_tools-1.10.0b6}/src/folio_migration_tools/migration_tasks/batch_poster.py

@@ -4,7 +4,6 @@ import json
 import logging
 import re
 import sys
-import time
 import traceback
 from datetime import datetime, timezone
 from typing import TYPE_CHECKING, Annotated, List, Optional
@@ -792,18 +791,19 @@ class BatchPoster(MigrationTaskBase):
             )
 
     def do_post(self, batch):
-        url = self.api_info["api_endpoint"]
-        if self.api_info["object_name"] == "users":
-            payload = {self.api_info["object_name"]: list(batch), "totalRecords": len(batch)}
-        elif self.api_info["total_records"]:
-            payload = {"records": list(batch), "totalRecords": len(batch)}
-        else:
-            payload = {self.api_info["object_name"]: batch}
-        return self.folio_client.folio_post(
-            url,
-            payload,
-            query_params=self.query_params,
-        )
+        with self.folio_client.get_folio_http_client() as http_client:
+            url = self.api_info["api_endpoint"]
+            if self.api_info["object_name"] == "users":
+                payload = {self.api_info["object_name"]: list(batch), "totalRecords": len(batch)}
+            elif self.api_info["total_records"]:
+                payload = {"records": list(batch), "totalRecords": len(batch)}
+            else:
+                payload = {self.api_info["object_name"]: batch}
+            return http_client.post(
+                url,
+                json=payload,
+                params=self.query_params,
+            )
 
     def get_current_record_count_in_folio(self):
         if "query_endpoint" in self.api_info:

{folio_migration_tools-1.10.0b4 → folio_migration_tools-1.10.0b6}/src/folio_migration_tools/migration_tasks/migration_task_base.py

@@ -99,6 +99,7 @@ class MigrationTaskBase:
         raise NotImplementedError()
 
     def clean_out_empty_logs(self):
+        _close_handler(self.data_issue_file_handler)
         if (
             self.folder_structure.data_issue_file_path.is_file()
             and os.stat(self.folder_structure.data_issue_file_path).st_size == 0
@@ -260,13 +261,13 @@ class MigrationTaskBase:
 
         # Data issue file formatter
         data_issue_file_formatter = logging.Formatter("%(message)s")
-        data_issue_file_handler = logging.FileHandler(
+        self.data_issue_file_handler = logging.FileHandler(
             filename=str(self.folder_structure.data_issue_file_path), mode="w"
         )
-        data_issue_file_handler.addFilter(LevelFilter(26))
-        data_issue_file_handler.setFormatter(data_issue_file_formatter)
-        data_issue_file_handler.setLevel(26)
-        logging.getLogger().addHandler(data_issue_file_handler)
+        self.data_issue_file_handler.addFilter(LevelFilter(26))
+        self.data_issue_file_handler.setFormatter(data_issue_file_formatter)
+        self.data_issue_file_handler.setLevel(26)
+        logging.getLogger().addHandler(self.data_issue_file_handler)
         logger.info("Logging set up")
 
     def setup_records_map(self, mapping_file_path):
@@ -553,3 +554,10 @@ class LevelFilter(logging.Filter):
 
     def filter(self, record):
         return record.levelno == self.level
+
+
+def _close_handler(handler: logging.Handler | None):
+    if handler is None:
+        return
+    handler.flush()
+    handler.close()

{folio_migration_tools-1.10.0b4 → folio_migration_tools-1.10.0b6}/src/folio_migration_tools/migration_tasks/user_transformer.py

@@ -101,6 +101,16 @@ class UserTransformer(MigrationTaskBase):
                 ),
             ),
         ] = False
+        remove_username: Annotated[
+            Optional[bool],
+            Field(
+                title="Remove username",
+                description=(
+                    "Specify whether to remove username. Resulting objects are not compatible with"
+                    " the mod-user-import. Optional, by default is False"
+                ),
+            ),
+        ] = False
 
     @staticmethod
     def get_object_type() -> FOLIONamespaces: