folio-migration-tools 1.10.0b4__py3-none-any.whl → 1.10.0b6__py3-none-any.whl

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/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/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/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:

{folio_migration_tools-1.10.0b4.dist-info → folio_migration_tools-1.10.0b6.dist-info}/METADATA

@@ -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.dist-info → folio_migration_tools-1.10.0b6.dist-info}/RECORD

@@ -22,7 +22,7 @@ folio_migration_tools/mapping_file_transformation/notes_mapper.py,sha256=vCmZmjr
 folio_migration_tools/mapping_file_transformation/order_mapper.py,sha256=VUcbeBGlQ7KsDPgJlaOOe8bO0y5IRLTCBH_IQKcaqiA,18267
 folio_migration_tools/mapping_file_transformation/organization_mapper.py,sha256=MKlN3doQ_R-Y3klkbCFL4qHUfhMATBsIhvq1jpmajqQ,14641
 folio_migration_tools/mapping_file_transformation/ref_data_mapping.py,sha256=rROcBiL5TE7bWsJ95A6shurPZ1e4In6PTwR5BN9amzU,8991
-folio_migration_tools/mapping_file_transformation/user_mapper.py,sha256=13cvFr7Vp6uxZNpAmLxGvPVLC1_En2NVvLtuP75HAzU,8846
+folio_migration_tools/mapping_file_transformation/user_mapper.py,sha256=nqyoSQAo3IGAAzXVRM-R0M5Q83zS3uU6jvKx4_c1mt8,8940
 folio_migration_tools/marc_rules_transformation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 folio_migration_tools/marc_rules_transformation/conditions.py,sha256=-5U6nBGcBO49C9MMyxOL2wMhHGxUawkIM9e-MwNaM_4,46938
 folio_migration_tools/marc_rules_transformation/holdings_statementsparser.py,sha256=-mOGtoPa3qmEqGWtyBTN-fQ743ZmT8caDLc9ES9J74Y,13667
@@ -35,7 +35,7 @@ folio_migration_tools/marc_rules_transformation/rules_mapper_bibs.py,sha256=F8tK
 folio_migration_tools/marc_rules_transformation/rules_mapper_holdings.py,sha256=YILyEfO-LkQPk-4OjiuY68X5xDA0LlI7UUp7_mvzLUE,29184
 folio_migration_tools/migration_report.py,sha256=B8e4tMfT0xCJ3BxkSg7ZZJYmg0VLQVXmmVnWwmojZD4,4260
 folio_migration_tools/migration_tasks/__init__.py,sha256=ZkbY_yGyB84Ke8OMlYUzyyBj4cxxNrhMTwQlu_GbdDs,211
-folio_migration_tools/migration_tasks/batch_poster.py,sha256=dIsqqjizuJN0BOj98uK4EsAQgdCcQwMwvK2CUtifd7w,46120
+folio_migration_tools/migration_tasks/batch_poster.py,sha256=rbSx3dyF4UbNdFiAhBRDpBTvAwQI3BR4s4_sIBsM-70,46214
 folio_migration_tools/migration_tasks/bibs_transformer.py,sha256=zPxh2tjyqx88fuH1FuKLwhT6lhZ5fVTQAqE08IggYgM,6351
 folio_migration_tools/migration_tasks/courses_migrator.py,sha256=sKIeyUlc7o189lw88XbGILVkwnR9krqO0PgS-vLCCm8,7039
 folio_migration_tools/migration_tasks/holdings_csv_transformer.py,sha256=JzOufqjSR2V-gUvOq0pdQFsXjpxk1ldGJBQWIWGfCps,21915
@@ -43,12 +43,12 @@ folio_migration_tools/migration_tasks/holdings_marc_transformer.py,sha256=b1lWbY
 folio_migration_tools/migration_tasks/items_transformer.py,sha256=gIJ9SKUENE3OaEouGAFTsGjciN_YxwRoUAAEKJlfG-E,19498
 folio_migration_tools/migration_tasks/loans_migrator.py,sha256=6mwtA9-6B_pU1GKS9VD7Wu5stZ8YLlyeliFJhyPuho0,38785
 folio_migration_tools/migration_tasks/manual_fee_fines_transformer.py,sha256=CnmlTge7nChUJ10EiUkriQtJlVxWqglgfhjgneh2_yM,7247
-folio_migration_tools/migration_tasks/migration_task_base.py,sha256=yg96RuRHgapDHNjLE-1Fg_gpRmaRmVx7GUm45lHTIBY,22339
+folio_migration_tools/migration_tasks/migration_task_base.py,sha256=rhIYFZ_dYWEyopkR2shht5ybKk4JQzxctSlBizml50g,22551
 folio_migration_tools/migration_tasks/orders_transformer.py,sha256=h8EyRbvbtwDZJq1y73J7oZFRdI1U4vq1Vrlay4GLf4M,13885
 folio_migration_tools/migration_tasks/organization_transformer.py,sha256=5s-ACb9-R8JLlPnROOq1ZnDIRCLQeWaxORDn0SrhQqs,16747
 folio_migration_tools/migration_tasks/requests_migrator.py,sha256=Q7sWOxqq73Fdg3Q1tmpvRxU9qhhG1BV3AGMoCMwh2cE,14768
 folio_migration_tools/migration_tasks/reserves_migrator.py,sha256=jdiwWAlMydXE2vlv0lgHRUljarslveyVOu-TCnymAEs,9953
-folio_migration_tools/migration_tasks/user_transformer.py,sha256=fWfcO9Njwpyt0-De3nhC_gMu_lHOEkhMdCRryXz3xcc,12241
+folio_migration_tools/migration_tasks/user_transformer.py,sha256=apgVCoJQ4sB5aFp7p8FdSQrDfXSIzgEbEQ3C-6dG568,12621
 folio_migration_tools/task_configuration.py,sha256=6eqbjjSWfi-qgp0bhCsuBVE3gTK4HaXzXsAo68JPGc0,1146
 folio_migration_tools/transaction_migration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 folio_migration_tools/transaction_migration/legacy_loan.py,sha256=A5qvThfP3g62YnykLyti_tqTY7dq1SbLi3WZz7QXk6s,7399
@@ -56,7 +56,7 @@ folio_migration_tools/transaction_migration/legacy_request.py,sha256=Kv7jpBIuZ_q
 folio_migration_tools/transaction_migration/legacy_reserve.py,sha256=qzw0okg4axAE_ezXopP9gFsQ_e60o0zh7zqRzFBSWHY,1806
 folio_migration_tools/transaction_migration/transaction_result.py,sha256=cTdCN0BnlI9_ZJB2Z3Fdkl9gpymIi-9mGZsRFlQcmDk,656
 folio_migration_tools/translations/en.json,sha256=pS7dhHmj4XBqTcFNIcqFgRMY557fQan1RomdNg6PtdA,40941
-folio_migration_tools-1.10.0b4.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-folio_migration_tools-1.10.0b4.dist-info/entry_points.txt,sha256=mJRRiCNP9j7_NpVXamHEiW8pDEjWQs1vEqD89G354cM,79
-folio_migration_tools-1.10.0b4.dist-info/METADATA,sha256=JlJpqIeLAOLOFk0kqT7_ZcS5pO-0o-NgaXlBPt2Kh7A,7162
-folio_migration_tools-1.10.0b4.dist-info/RECORD,,
+folio_migration_tools-1.10.0b6.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+folio_migration_tools-1.10.0b6.dist-info/entry_points.txt,sha256=mJRRiCNP9j7_NpVXamHEiW8pDEjWQs1vEqD89G354cM,79
+folio_migration_tools-1.10.0b6.dist-info/METADATA,sha256=EcDMNh4diSH6vDbrIQWdk-kcTdM2W2Agw3X4lo22h2Y,7162
+folio_migration_tools-1.10.0b6.dist-info/RECORD,,