Merge pull request #83 from Jylpah/dev

version 0.3.5

Author: Jylpah

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyutils"
-version = "0.3.4"
+version = "0.3.6"
 authors = [{ name = "Jylpah", email = "[email protected]" }]
 description = "Misc Python utils and classes"
 readme = "README.md"
@@ -19,10 +19,10 @@ dependencies = [
     "aiofiles>=23.1.0",
     "aiohttp>=3.8.4",
     "aioconsole>=0.6.1",
-    "aiosqlite>=0.19.0",
+#    "aiosqlite>=0.19.0",
     "aiocsv>=1.2.4",
     "alive-progress>=3.1.1",
-    "isort>=5.12.0",
+#    "isort>=5.12.0",
     "pydantic>=1.10.7, == 1.*",
     "pymongo>=4.3.3",
 ]

src/pyutils/__init__.py

@@ -39,17 +39,18 @@
     epoch_now,
     alive_bar_monitor,
     is_alphanum,
-    #   read_config,
+    # read_config,
     get_datestr,
     get_url,
-    get_urls,
-    get_url_JSON_model,
-    get_url_JSON_models,
+    # get_urls,
+    get_url_model,
+    # get_url_JSON_models,
     get_url_JSON,
-    get_urls_JSON,
-    get_urls_JSON_models,
+    # get_urls_JSON,
+    # get_urls_JSON_models,
     get_temp_filename,
     chunker,
+    str2path,
 )
 
 

src/pyutils/csvexportable.py

@@ -13,6 +13,9 @@
 from datetime import date, datetime
 from aiofiles import open
 from enum import Enum
+from pathlib import Path
+
+from .utils import str2path
 
 # Setup logging
 logger = logging.getLogger()
@@ -50,7 +53,9 @@ def csv_headers(self) -> list[str]:
         """Provide CSV headers as list"""
         return list(self.dict(exclude_unset=False, by_alias=False).keys())
 
-    def _csv_write_fields(self, left: dict[str, Any]) -> tuple[dict[str, Any], dict[str, Any]]:
+    def _csv_write_fields(
+        self, left: dict[str, Any]
+    ) -> tuple[dict[str, Any], dict[str, Any]]:
         """Write CSV fields with custom encoders
 
         Returns columns_done, columns_left
@@ -90,7 +95,9 @@ def csv_row(self) -> dict[str, str | int | float | bool]:
                 res[key] = None
         return self._clear_None(res)
 
-    def _clear_None(self, res: dict[str, str | int | float | bool | None]) -> dict[str, str | int | float | bool]:
+    def _clear_None(
+        self, res: dict[str, str | int | float | bool | None]
+    ) -> dict[str, str | int | float | bool]:
         out: dict[str, str | int | float | bool] = dict()
         for key, value in res.items():
             if value is None:
@@ -100,7 +107,9 @@ def _clear_None(self, res: dict[str, str | int | float | bool | None]) -> dict[s
         return out
 
     @classmethod
-    def _csv_read_fields(cls, row: dict[str, Any]) -> tuple[dict[str, Any], dict[str, Any]]:
+    def _csv_read_fields(
+        cls, row: dict[str, Any]
+    ) -> tuple[dict[str, Any], dict[str, Any]]:
         """read CSV fields with custom encoding.
         Returns read, unread fields as dict[str, Any]"""
 
@@ -140,7 +149,9 @@ def from_csv(cls, row: dict[str, Any]) -> Self | None:
                     elif field_type is bool:
                         res[field] = row[field] == "True"
                     elif issubclass(field_type, Enum):
-                        res[field] = field_type[str(row[field])]  ## Enums are stored by key, not value
+                        res[field] = field_type[
+                            str(row[field])
+                        ]  ## Enums are stored by key, not value
                     elif field_type is date:
                         res[field] = date.fromisoformat(row[field])
                     elif field_type is datetime:
@@ -162,11 +173,11 @@ def from_csv(cls, row: dict[str, Any]) -> Self | None:
         return None
 
     @classmethod
-    async def import_csv(cls, filename: str) -> AsyncGenerator[Self, None]:
+    async def import_csv(cls, filename: Path | str) -> AsyncGenerator[Self, None]:
         """Import from filename, one model per line"""
         try:
+            debug("importing from CSV file: %s", str(filename))
             dialect: Type[Dialect] = excel
-            debug("importing from CSV file: %s", filename)
             async with open(filename, mode="r", newline="") as f:
                 async for row in AsyncDictReader(f, dialect=dialect):
                     # debug ("row: %s", row)