rdxz2-utill 0.0.3__tar.gz → 0.0.5__tar.gz

{rdxz2_utill-0.0.3/src/rdxz2_utill.egg-info → rdxz2_utill-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rdxz2-utill
-Version: 0.0.3
+Version: 0.0.5
 Summary: Your daily Python utility
 Author-email: Richard Dharmawan <richard.dharmawan@gmail.com>
 License: MIT License

{rdxz2_utill-0.0.3 → rdxz2_utill-0.0.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rdxz2-utill"
-version = "0.0.3"
+version = "0.0.5"
 authors = [
   { name="Richard Dharmawan", email="richard.dharmawan@gmail.com" },
 ]

{rdxz2_utill-0.0.3 → rdxz2_utill-0.0.5/src/rdxz2_utill.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rdxz2-utill
-Version: 0.0.3
+Version: 0.0.5
 Summary: Your daily Python utility
 Author-email: Richard Dharmawan <richard.dharmawan@gmail.com>
 License: MIT License

{rdxz2_utill-0.0.3 → rdxz2_utill-0.0.5}/src/rdxz2_utill.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ src/rdxz2_utill.egg-info/requires.txt
 src/rdxz2_utill.egg-info/top_level.txt
 src/utill/__init__.py
 src/utill/my_bq.py
+src/utill/my_compare.py
 src/utill/my_const.py
 src/utill/my_csv.py
 src/utill/my_datetime.py

{rdxz2_utill-0.0.3 → rdxz2_utill-0.0.5}/src/utill/my_bq.py

@@ -12,7 +12,6 @@ from .my_const import ByteSize
 from .my_csv import read_header, combine as csv_combine, compress
 from .my_datetime import current_datetime_str
 from .my_env import envs
-from .my_file import make_sure_path_is_directory
 from .my_gcs import GCS
 from .my_queue import ThreadingQ
 from .my_string import replace_nonnumeric
@@ -248,9 +247,10 @@ class BQ():
     def download_csv(self, query: str, dst_filename: str, combine: bool = True, pre_query: str = None):
         if not dst_filename.endswith('.csv'):
             raise ValueError('Destination filename must ends with .csv!')
+        
+        dst_filename = os.path.expanduser(dst_filename)
 
-        dirname = os.path.dirname(dst_filename)
-        make_sure_path_is_directory(dirname)
+        dirname = dst_filename.removesuffix('.csv')
 
         # Remove & recreate existing folder
         if os.path.exists(dirname):

rdxz2_utill-0.0.5/src/utill/my_compare.py

@@ -0,0 +1,34 @@
+import math
+
+
+def try_float(value) -> float:
+    try:
+        return float(value)
+    except:
+        return value
+
+
+def same(a, b, float_precision=None) -> tuple[bool, float]:
+    if a is None and b is None:
+        return True, None
+
+    if a is None or b is None:
+        return False, None
+
+    # Compare float
+    a_float = try_float(a)
+    b_float = try_float(b)
+    if isinstance(a_float, float) or isinstance(b_float, float):
+        try:
+            if math.isnan(a_float) and math.isnan(b_float):
+                return True, None
+
+            if float_precision:
+                a_float_rounded = round(a_float, float_precision)
+                b_float_rounded = round(b_float, float_precision)
+
+            return a_float_rounded == b_float_rounded, abs(a_float - b_float)
+        except (ValueError, TypeError):
+            raise Exception(f'Can\'t compare {a} to {b}')
+
+    return str(a) == str(b), None

{rdxz2_utill-0.0.3 → rdxz2_utill-0.0.5}/src/utill/my_csv.py

@@ -81,6 +81,7 @@ def combine(src_filenames: list[str], dst_filename: str) -> None:
                 # Copy the header if this is the first file
                 if first_file:
                     csvwriter.writerow(next(csvreader))
+                    first_file = False
                 # Else, skip the header
                 else:
                     next(csvreader)

{rdxz2_utill-0.0.3 → rdxz2_utill-0.0.5}/src/utill/my_gcs.py

@@ -30,6 +30,8 @@ class GCS:
         return f'{self.base_path}/{path}' if self.base_path else path
 
     def change_bucket(self, bucket_name: str):
+        if not bucket_name:
+            raise ValueError('Bucket name needed')
         self.bucket = self.client.bucket(bucket_name)
         logger.debug(f'Change bucket to {self.bucket.name}')
 

{rdxz2_utill-0.0.3 → rdxz2_utill-0.0.5}/src/utill/my_pg.py

@@ -99,59 +99,61 @@ class PG:
                 for data in copy:
                     f.write(data)
 
-    def pg_to_pg(self, pg: "PG", source_table: str, target_table: str, cols: list[str] = None) -> None:
+    def pg_to_pg(self, pg: "PG", src_table_name: str, dst_table_name: str, cols: list[str] = None) -> None:
         tmp_filename = generate_random_string() + '.csv'
         cols_str = ','.join([f'"{x}"' for x in cols]) if (cols is not None and cols != []) else '*'
         try:
-            self.download_csv(f'SELECT {cols_str} FROM {source_table}', tmp_filename)
-            pg.upload_csv(tmp_filename, target_table)
+            self.download_csv(f'SELECT {cols_str} FROM {src_table_name}', tmp_filename)
+            pg.upload_csv(tmp_filename, dst_table_name)
         except:
             raise
         finally:
             os.remove(tmp_filename) if os.path.exists(tmp_filename) else None
 
     def check_table_existence(self, table_name: str) -> bool:
-        if not self.execute_query('''SELECT count(1) AS "cnt" FROM "information_schema"."tables" WHERE "table_schema" || '.' || "table_name" = '%s';''', table_name).fetchone()['cnt']:
+        if not self.execute_query('''SELECT count(1) AS "cnt" FROM "information_schema"."tables" WHERE "table_schema" || '.' || "table_name" = %s;''', table_name).fetchone()[0]:
             raise Exception(f'Target table \'{table_name}\' not created, please create it first!')
 
-    def upload_tuples(self, cols: list[str], tuples: list[tuple], table_name: str) -> None:
-        self.check_table_existence(table_name)
+    def upload_tuples(self, cols: list[str], src_tuples: list[tuple], src_table_name: str) -> None:
+        self.check_table_existence(src_table_name)
 
         cols_str = ','.join([f'"{x}"' for x in cols])
-        query = f'''COPY {table_name}({cols_str}) FROM STDIN'''
+        query = f'''COPY {src_table_name}({cols_str}) FROM STDIN'''
         logger.debug(f'🔎 Query:\n{query}')
         with self.cursor.copy(query) as copy:
-            for row in tuples:
+            for row in src_tuples:
                 copy.write_row(row)
 
-    def upload_list_of_dict(self, data: list[dict], table_name: str) -> None:
-        self.check_table_existence(table_name)
+    def upload_list_of_dict(self, src_data: list[dict], dst_table_name: str) -> None:
+        self.check_table_existence(dst_table_name)
 
-        if len(data) == 0:
+        if len(src_data) == 0:
             raise ValueError('No data to upload!')
 
-        cols = data[0].keys()
+        cols = src_data[0].keys()
         cols_str = ','.join([f'"{x}"' for x in cols])
-        query = f'''COPY {table_name}({cols_str}) FROM STDIN'''
+        query = f'''COPY {dst_table_name}({cols_str}) FROM STDIN'''
         logger.debug(f'🔎 Query:\n{query}')
         with self.cursor.copy(query) as copy:
-            for row in data:
+            for row in src_data:
                 copy.write_row(tuple(row[col] for col in cols))
 
-    def upload_csv(self, file_path: str, table_name: str) -> None:
-        self.check_table_existence(table_name)
+    def upload_csv(self, src_filename: str, dst_table_name: str) -> None:
+        src_filename = os.path.expanduser(src_filename)
 
-        cols_str = ','.join([f'"{x}"' for x in next(csv.reader(open(file_path, 'r')))])
+        self.check_table_existence(dst_table_name)
+
+        cols_str = ','.join([f'"{x}"' for x in next(csv.reader(open(src_filename, 'r')))])
         query = dedent(
             f'''
-            COPY {table_name}({cols_str})
+            COPY {dst_table_name}({cols_str})
             FROM STDIN
             DELIMITER ','
             CSV HEADER;
             '''
         )
         logger.debug(f'🔎 Query:\n{query}')
-        with open(os.path.expanduser(file_path), 'r') as f:
+        with open(os.path.expanduser(src_filename), 'r') as f:
             with self.cursor.copy(query) as copy:
                 while data := f.read(1024):
                     copy.write(data)

rdxz2_utill-0.0.5/src/utill/templates/mb.json

@@ -0,0 +1,5 @@
+{
+  "base_url": "xxx",
+  "api_key": "xxx",
+  "end": true
+}

{rdxz2_utill-0.0.3 → rdxz2_utill-0.0.5}/src/utill/templates/pg.json

@@ -9,5 +9,6 @@
     "db": "xxx",
     "username": "xxx",
     "password": "xxx"
-  }
+  },
+  "end": true
 }

rdxz2_utill-0.0.3/src/utill/templates/mb.json

@@ -1,4 +0,0 @@
-{
-  "base_url": "xxx",
-  "api_key": "xxx"
-}