folio-data-import 0.2.0__tar.gz → 0.2.2__tar.gz

{folio_data_import-0.2.0 → folio_data_import-0.2.2}/LICENSE

@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

{folio_data_import-0.2.0 → folio_data_import-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: folio_data_import
-Version: 0.2.0
+Version: 0.2.2
 Summary: A python module to interact with the data importing capabilities of the open-source FOLIO ILS
 License: MIT
 Author: Brooks Travis
@@ -13,6 +13,11 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: aiofiles (>=24.1.0,<25.0.0)
+Requires-Dist: flake8-bandit (>=4.1.1,<5.0.0)
+Requires-Dist: flake8-black (>=0.3.6,<0.4.0)
+Requires-Dist: flake8-bugbear (>=24.8.19,<25.0.0)
+Requires-Dist: flake8-docstrings (>=1.7.0,<2.0.0)
+Requires-Dist: flake8-isort (>=6.1.1,<7.0.0)
 Requires-Dist: folioclient (>=0.60.5,<0.61.0)
 Requires-Dist: httpx (>=0.23.0,<0.24.0)
 Requires-Dist: inquirer (>=3.4.0,<4.0.0)

{folio_data_import-0.2.0 → folio_data_import-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "folio_data_import"
-version = "0.2.0"
+version = "0.2.2"
 description = "A python module to interact with the data importing capabilities of the open-source FOLIO ILS"
 authors = ["Brooks Travis <brooks.travis@gmail.com>"]
 license = "MIT"
@@ -22,10 +22,17 @@ inquirer = "^3.4.0"
 tqdm = "^4.66.5"
 tabulate = "^0.9.0"
 aiofiles = "^24.1.0"
+flake8-black = "^0.3.6"
+flake8-bugbear = "^24.8.19"
+flake8-bandit = "^4.1.1"
+flake8-isort = "^6.1.1"
+flake8-docstrings = "^1.7.0"
 
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.3.2"
+flake8 = "^7.1.1"
+black = "^24.8.0"
 
 [build-system]
 requires = ["poetry-core"]

{folio_data_import-0.2.0 → folio_data_import-0.2.2}/src/folio_data_import/MARCDataImport.py

@@ -436,6 +436,12 @@ async def main() -> None:
     parser = argparse.ArgumentParser()
     parser.add_argument("--gateway_url", type=str, help="The FOLIO API Gateway URL")
     parser.add_argument("--tenant_id", type=str, help="The FOLIO tenant ID")
+    parser.add_argument(
+        "--member_tenant_id",
+        type=str,
+        help="The FOLIO ECS member tenant ID (if applicable)",
+        default="",
+    )
     parser.add_argument("--username", type=str, help="The FOLIO username")
     parser.add_argument("--password", type=str, help="The FOLIO password", default="")
     parser.add_argument(
@@ -480,6 +486,11 @@ async def main() -> None:
     folio_client = folioclient.FolioClient(
         args.gateway_url, args.tenant_id, args.username, args.password
     )
+
+    # Set the member tenant id if provided to support FOLIO ECS multi-tenant environments
+    if args.member_tenant_id:
+        folio_client.okapi_headers["x-okapi-tenant"] = args.member_tenant_id
+
     if not args.import_profile_name:
         import_profiles = folio_client.folio_get(
             "/data-import-profiles/jobProfiles",

{folio_data_import-0.2.0 → folio_data_import-0.2.2}/src/folio_data_import/UserImport.py

@@ -238,19 +238,20 @@ class UserImporter:  # noqa: R0902
             None
         """
         mapped_departments = []
-        for department in user_obj["departments"]:
+        for department in user_obj.pop("departments", []):
             try:
                 mapped_departments.append(self.department_map[department])
             except KeyError:
                 print(
-                    f'Row {line_number}: Department "{department}" not found, '
+                    f'Row {line_number}: Department "{department}" not found, '  # noqa: B907
                     f"excluding department from user"
                 )
                 await self.logfile.write(
-                    f'Row {line_number}: Department "{department}" not found, '
+                    f'Row {line_number}: Department "{department}" not found, '  # noqa: B907
                     f"excluding department from user\n"
                 )
-        user_obj["departments"] = mapped_departments
+        if mapped_departments:
+            user_obj["departments"] = mapped_departments
 
     async def update_existing_user(self, user_obj, existing_user) -> Tuple[dict, dict]:
         """
@@ -630,6 +631,11 @@ async def main() -> None:
     """
     parser = argparse.ArgumentParser()
     parser.add_argument("--tenant_id", help="The tenant id")
+    parser.add_argument(
+        "--member_tenant_id",
+        help="The FOLIO ECS member tenant id (if applicable)",
+        default="",
+    )
     parser.add_argument("--library_name", help="The name of the library")
     parser.add_argument("--username", help="The FOLIO username")
     parser.add_argument("--okapi_url", help="The Okapi URL")
@@ -672,8 +678,15 @@ async def main() -> None:
         args.username,
         args.folio_password
         or os.environ.get("FOLIO_PASS", "")
-        or getpass.getpass("Enter your FOLIO password: "),
+        or getpass.getpass(
+            "Enter your FOLIO password: ",
+        ),
     )
+
+    # Set the member tenant id if provided to support FOLIO ECS multi-tenant environments
+    if args.member_tenant_id:
+        folio_client.okapi_headers["x-okapi-tenant"] = args.member_tenant_id
+
     user_file_path = Path(args.user_file_path)
     log_file_path = (
         user_file_path.parent.parent

{folio_data_import-0.2.0 → folio_data_import-0.2.2}/src/folio_data_import/__main__.py

@@ -45,7 +45,10 @@ async def main():
     parser.add_argument(
         "--consolidate",
         action="store_true",
-        help="Consolidate records into a single job. Default is to create a new job for each MARC file.",
+        help=(
+            "Consolidate records into a single job. "
+            "Default is to create a new job for each MARC file."
+        ),
     )
     parser.add_argument(
         "--no-progress",
@@ -96,7 +99,10 @@ async def main():
             print("Error importing files: " + str(e))
             raise
     elif args.record_type.lower() == "users":
-        print("User import not yet implemented. Run UserImport.py directly or use folio-user-import CLI.")
+        print(
+            "User import not yet implemented. Run UserImport.py directly "
+            "or use folio-user-import CLI."
+        )
     else:
         print("Record type not supported. Supported types are: MARC21")