rdxz2-utill 0.0.2__tar.gz → 0.0.4__tar.gz

{rdxz2_utill-0.0.2/src/rdxz2_utill.egg-info → rdxz2_utill-0.0.4}/PKG-INFO

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

{rdxz2_utill-0.0.2 → rdxz2_utill-0.0.4}/pyproject.toml

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

{rdxz2_utill-0.0.2 → rdxz2_utill-0.0.4/src/rdxz2_utill.egg-info}/PKG-INFO

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

{rdxz2_utill-0.0.2 → rdxz2_utill-0.0.4}/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.2 → rdxz2_utill-0.0.4}/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
@@ -249,8 +248,7 @@ class BQ():
         if not dst_filename.endswith('.csv'):
             raise ValueError('Destination filename must ends with .csv!')
 
-        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.4/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.2 → rdxz2_utill-0.0.4}/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.2 → rdxz2_utill-0.0.4}/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.2 → rdxz2_utill-0.0.4}/src/utill/my_pg.py

@@ -24,7 +24,7 @@ class PG:
     ) -> None:
         # Evaluate config source
         if isinstance(config_source, str):
-            if os.path.exists(config_source):
+            if not os.path.exists(config_source):
                 raise ValueError(f'Config source file not found: {config_source}, create one with \'utill init\'')
             if connection is None:
                 raise ValueError('Connection name must be provided when using file source!')

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

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

{rdxz2_utill-0.0.2 → rdxz2_utill-0.0.4}/src/utill/templates/pg.json

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

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

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