tracktolib 0.53.1__tar.gz → 0.54.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,8 +1,7 @@
1
- Metadata-Version: 2.1
1
+ Metadata-Version: 2.3
2
2
  Name: tracktolib
3
- Version: 0.53.1
3
+ Version: 0.54.0
4
4
  Summary: Utility library for python
5
- Home-page: https://github.com/tracktor/tracktolib
6
5
  License: MIT
7
6
  Keywords: utility
8
7
  Author: Julien Brayere
@@ -32,6 +31,7 @@ Requires-Dist: pycryptodome (>=3.20.0) ; extra == "s3-minio"
32
31
  Requires-Dist: pydantic (>=2) ; extra == "api"
33
32
  Requires-Dist: python-json-logger (>=3.2.1) ; extra == "logs"
34
33
  Requires-Dist: rich (>=13.6.0) ; extra == "pg"
34
+ Project-URL: Homepage, https://github.com/tracktor/tracktolib
35
35
  Project-URL: Repository, https://github.com/tracktor/tracktolib
36
36
  Description-Content-Type: text/markdown
37
37
 
@@ -1,6 +1,6 @@
1
1
  [tool.poetry]
2
2
  name = "tracktolib"
3
- version = "0.53.1"
3
+ version = "0.54.0"
4
4
  description = "Utility library for python"
5
5
  authors = ["Julien Brayere <julien.brayere@tracktor.fr>"]
6
6
  license = "MIT"
@@ -55,7 +55,7 @@ httpx = "^0.27.0"
55
55
  psycopg = "^3.2.1"
56
56
  minio = "^7.2.7"
57
57
  pycryptodome = "^3.20.0"
58
- aiobotocore = "^2.13.1"
58
+ aiobotocore = "2.15.2"
59
59
  python-json-logger = "^3.2.0"
60
60
 
61
61
 
@@ -83,7 +83,7 @@ pythonPlatform = "Linux"
83
83
 
84
84
  [tool.commitizen]
85
85
  name = "cz_conventional_commits"
86
- version = "0.53.1"
86
+ version = "0.54.0"
87
87
  tag_format = "$version"
88
88
  version_files = [
89
89
  "pyproject.toml:version"
@@ -15,6 +15,21 @@ except ImportError:
15
15
  from .pg_utils import get_tmp_table_query
16
16
 
17
17
 
18
+ __all__ = (
19
+ "clean_tables",
20
+ "drop_db",
21
+ "fetch_all",
22
+ "fetch_count",
23
+ "fetch_one",
24
+ "get_insert_data",
25
+ "get_tables",
26
+ "insert_many",
27
+ "insert_one",
28
+ "insert_csv",
29
+ "set_seq_max",
30
+ )
31
+
32
+
18
33
  def fetch_all(engine: Connection, query: LiteralString, *data) -> list[dict]:
19
34
  with engine.cursor(row_factory=dict_row) as cur:
20
35
  resp = (cur.execute(query) if not data else cur.execute(query, data)).fetchall()
@@ -59,7 +74,7 @@ def _parse_value(v):
59
74
  return v
60
75
 
61
76
 
62
- def _get_insert_data(table: LiteralString, data: list[dict]) -> tuple[LiteralString, list[tuple[Any, ...]]]:
77
+ def get_insert_data(table: LiteralString, data: list[dict]) -> tuple[LiteralString, list[tuple[Any, ...]]]:
63
78
  keys = data[0].keys()
64
79
  _values = ",".join("%s" for _ in range(0, len(keys)))
65
80
  query = f"INSERT INTO {table} as t ({','.join(keys)}) VALUES ({_values})"
@@ -67,17 +82,37 @@ def _get_insert_data(table: LiteralString, data: list[dict]) -> tuple[LiteralStr
67
82
 
68
83
 
69
84
  def insert_many(engine: Connection, table: LiteralString, data: list[dict]):
70
- query, _data = _get_insert_data(table, data)
85
+ query, _data = get_insert_data(table, data)
71
86
  with engine.cursor() as cur:
72
87
  _ = cur.executemany(query, _data)
73
88
  engine.commit()
74
89
 
75
90
 
76
- def insert_one(engine: Connection, table: LiteralString, data: dict):
77
- query, _data = _get_insert_data(table, [data])
78
- with engine.cursor() as cur:
91
+ @overload
92
+ def insert_one(engine: Connection, table: LiteralString, data: dict, returning: None = None) -> None: ...
93
+
94
+
95
+ @overload
96
+ def insert_one(engine: Connection, table: LiteralString, data: dict, returning: list[LiteralString]) -> dict: ...
97
+
98
+
99
+ def insert_one(
100
+ engine: Connection, table: LiteralString, data: dict, returning: list[LiteralString] | None = None
101
+ ) -> dict | None:
102
+ query, _data = get_insert_data(table, [data])
103
+ _is_returning = False
104
+ if returning:
105
+ query = f"{query} RETURNING {','.join(returning)}"
106
+ _is_returning = True
107
+
108
+ with engine.cursor(row_factory=dict_row) as cur:
79
109
  _ = cur.execute(query, _data[0])
110
+ if _is_returning:
111
+ resp = cur.fetchone()
112
+ else:
113
+ resp = None
80
114
  engine.commit()
115
+ return resp
81
116
 
82
117
 
83
118
  def drop_db(conn: Connection, db_name: LiteralString):
File without changes
File without changes