tracktolib 0.56.0__tar.gz → 0.58.0__tar.gz

{tracktolib-0.56.0 → tracktolib-0.58.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: tracktolib
-Version: 0.56.0
+Version: 0.58.0
 Summary: Utility library for python
 License: MIT
 Keywords: utility

{tracktolib-0.56.0 → tracktolib-0.58.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tracktolib"
-version = "0.56.0"
+version = "0.58.0"
 description = "Utility library for python"
 authors = ["Julien Brayere <julien.brayere@tracktor.fr>"]
 license = "MIT"
@@ -83,7 +83,7 @@ pythonPlatform = "Linux"
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.56.0"
+version = "0.58.0"
 tag_format = "$version"
 version_files = [
     "pyproject.toml:version"

{tracktolib-0.56.0 → tracktolib-0.58.0}/tracktolib/pg_sync.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Iterable, Any, overload, Literal, cast, Optional
+from typing import Iterable, Any, overload, Literal, cast, Optional, Mapping, Sequence
 
 from typing_extensions import LiteralString
 
@@ -7,7 +7,7 @@ try:
     from psycopg import Connection, Cursor
     from psycopg.abc import Query
     from psycopg.errors import InvalidCatalogName
-    from psycopg.rows import dict_row
+    from psycopg.rows import dict_row, DictRow, TupleRow
     from psycopg.types.json import Json
 except ImportError:
     raise ImportError('Please install psycopg or tracktolib with "pg-sync" to use this module')
@@ -67,20 +67,22 @@ def fetch_one(engine: Connection, query: Query, *args, required: bool = False) -
     return _data
 
 
-def _parse_value(v):
+def _parse_value(v: Any) -> Any:
     if isinstance(v, dict):
         return Json(v)
     return v
 
 
-def get_insert_data(table: LiteralString, data: list[dict]) -> tuple[LiteralString, list[tuple[Any, ...]]]:
+def get_insert_data(
+    table: LiteralString, data: Sequence[Mapping[str, Any]]
+) -> tuple[LiteralString, list[tuple[Any, ...]]]:
     keys = data[0].keys()
     _values = ",".join("%s" for _ in range(0, len(keys)))
-    query = f"INSERT INTO {table} as t ({','.join(keys)}) VALUES ({_values})"
+    query = cast(LiteralString, f"INSERT INTO {table} as t ({','.join(keys)}) VALUES ({_values})")
     return query, [tuple(_parse_value(_x) for _x in x.values()) for x in data]
 
 
-def insert_many(engine: Connection | Cursor, table: LiteralString, data: list[dict]):
+def insert_many(engine: Connection | Cursor, table: LiteralString, data: Sequence[Mapping[str, Any]]):
     query, _data = get_insert_data(table, data)
     if isinstance(engine, Connection):
         with engine.cursor() as cur:
@@ -92,29 +94,41 @@ def insert_many(engine: Connection | Cursor, table: LiteralString, data: list[di
 
 
 @overload
-def insert_one(engine: Connection, table: LiteralString, data: dict, returning: None = None) -> None: ...
+def insert_one(engine: Connection, table: LiteralString, data: Mapping[str, Any], returning: None = None) -> None: ...
 
 
 @overload
-def insert_one(engine: Connection, table: LiteralString, data: dict, returning: list[LiteralString]) -> dict: ...
+def insert_one(
+    engine: Connection, table: LiteralString, data: Mapping[str, Any], returning: list[LiteralString]
+) -> dict: ...
+
+
+@overload
+def insert_one(
+    engine: Cursor, table: LiteralString, data: Mapping[str, Any], returning: list[LiteralString]
+) -> DictRow | TupleRow | None: ...
 
 
 def insert_one(
-    engine: Connection, table: LiteralString, data: dict, returning: list[LiteralString] | None = None
-) -> dict | None:
+    engine: Connection | Cursor,
+    table: LiteralString,
+    data: Mapping[str, Any],
+    returning: list[LiteralString] | None = None,
+) -> dict | DictRow | TupleRow | None:
     query, _data = get_insert_data(table, [data])
     _is_returning = False
     if returning:
         query = f"{query} RETURNING {','.join(returning)}"
         _is_returning = True
 
-    with engine.cursor(row_factory=dict_row) as cur:
-        _ = cur.execute(query, _data[0])
-        if _is_returning:
-            resp = cur.fetchone()
-        else:
-            resp = None
-    engine.commit()
+    if isinstance(engine, Connection):
+        with engine.cursor(row_factory=dict_row) as cur:
+            _ = cur.execute(query, _data[0])
+            resp = cur.fetchone() if _is_returning else None
+        engine.commit()
+    else:
+        _ = engine.execute(query, _data[0])
+        resp = engine.fetchone() if _is_returning else None
     return resp