dbhydra 2.2.8__py3-none-any.whl → 2.2.9__py3-none-any.whl

dbhydra/dbhydra_core.py

@@ -22,8 +22,8 @@ class Jsonable(str):
     """Is used as type in python_database_type_mapping"""    
     pass
 
-class BLOB(str):
-    """Store BLOBS up to 16MB."""    
+class Blob(str):
+    """Store BLOBs up to 16MB."""    
     pass
 
 

dbhydra/src/abstract_db.py

@@ -58,6 +58,7 @@ class AbstractDb(abc.ABC):
         'Union': 'object',
         'Optional': 'object',
         'Jsonable': 'Jsonable',
+        'Blob': 'Blob',
         # 'FrozenSet': frozenset,
         # 'Deque': list,
         # 'Any': object,

dbhydra/src/mysql_db.py

@@ -20,7 +20,7 @@ class MysqlDb(AbstractDb):
     'bool': "tinyint",
     'datetime': "datetime",
     'Jsonable': "json",
-    'BLOB': "mediumblob",
+    'Blob': "mediumblob",
     }
 
     def __init__(self, *args, **kwargs):

dbhydra/src/tables.py

@@ -5,7 +5,6 @@ import abc
 import time
 #xlsx imports
 import pathlib
-import pymysql
 from dbhydra.src.abstract_table import AbstractTable, AbstractSelectable, AbstractJoinable
 import binascii
 
@@ -906,6 +905,11 @@ class XlsxTable(AbstractTable):
         self.table_directory_path: pathlib.Path = self.db1.db_directory_path / table_filename
 
     def _save_table(self, df: pd.DataFrame):
+        blob_columns = [
+            column for column, type_ in self.column_type_dict.items() if type_ == "Blob"
+        ]
+        df[blob_columns] = df[blob_columns].map(lambda x: x.hex() if x is not None else None)
+
         if self.db1.is_csv:
             df.to_csv(self.table_directory_path, index=False)
         else:
@@ -963,6 +967,9 @@ class XlsxTable(AbstractTable):
         date_columns = [
             column for column, type_ in self.column_type_dict.items() if type_ == "datetime"
         ]
+        blob_columns = [
+            column for column, type_ in self.column_type_dict.items() if type_ == "Blob"
+        ]
 
         # BUG: If XlsxTable is being accessed by multiple threads, read operation
         # might fail due to race conditions. Add retry mechanism to handle these cases.
@@ -977,6 +984,8 @@ class XlsxTable(AbstractTable):
                 else:
                     print(f"Failed to read data from {self.table_directory_path}, returning empty DataFrame")
                     df = pd.DataFrame(columns=self.columns)
+
+        df[blob_columns] = df[blob_columns].map(lambda x: bytes.fromhex(x) if x else None)
         return df
 
     def _select(self, column_type_map, date_columns):

dbhydra/src/xlsx_db.py

@@ -41,7 +41,8 @@ class XlsxDb(AbstractDb):
         'dict': "str",
         'bool': "bool",
         'datetime': "datetime",
-        'Jsonable': "str"
+        'Jsonable': "str",
+        'Blob': "Blob"
         }
 
         

{dbhydra-2.2.8.dist-info → dbhydra-2.2.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbhydra
-Version: 2.2.8
+Version: 2.2.9
 Summary: Data science friendly ORM combining Python
 Home-page: https://github.com/DovaX/dbhydra
 Author: DovaX

{dbhydra-2.2.8.dist-info → dbhydra-2.2.9.dist-info}/RECORD

@@ -1,25 +1,25 @@
 dbhydra/__init__.py,sha256=DCocEeXf4QxdVlBRlNiFvuP5IZJ5aa77_DbUR-_4C14,65
-dbhydra/dbhydra_core.py,sha256=gMroDA_kVph7JFimbsNpGZ33f-qiGhw-su9EUkNN0bA,2537
+dbhydra/dbhydra_core.py,sha256=jn0VC3LkawR2P0Yd_oZNEXqP9o2BPEtOBWGzgFwfJyA,2537
 dbhydra/test_migrator.py,sha256=e3Nnb2mCd3CfjhjSexNg1tXVJMjkl5cCoYcuhbfZ4pM,803
 dbhydra/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dbhydra/src/abstract_db.py,sha256=lEP24vWz0HdGjQgSoHnawNK_NvRlSLuvzVSiiawssuw,5901
+dbhydra/src/abstract_db.py,sha256=JUIiFXGfbRbFQDWoxNS8ZAoYZMzgGeydd2KDC6zOlbY,5926
 dbhydra/src/abstract_table.py,sha256=4oZO5if4wMbyEWtr5JkR6LPxbxjUwMVf4xITbE-2RXE,17755
 dbhydra/src/bigquery_db.py,sha256=77XsgvYbANlvYaJnuVve-kz-PNBx_CHoYCL-eYnA8e4,1834
 dbhydra/src/migrator.py,sha256=QzaODEFfraD9_6HN_Osaidaj-nLYQryCYYWwJtUu3n8,18931
 dbhydra/src/mongo_db.py,sha256=mP48zRjI7mXKpm45R8prroZI-Eo7JKf0KJqGX-oTy3w,1922
-dbhydra/src/mysql_db.py,sha256=b0OV1nrYJBbzgTgBDKdLeENXQxKuYs_KhbvGvyymRf4,3180
+dbhydra/src/mysql_db.py,sha256=meMnFoY1Gx3Ay8jriqliJvByVUK4NPCQn_Zm1hEpwuU,3180
 dbhydra/src/postgres_db.py,sha256=L7MaBq_6ArwDSP_5LaEqK58oLxZ1X7FgIokcDOSB7wk,1805
 dbhydra/src/sqlserver_db.py,sha256=9Xi3NAliqM79MTV8fpNQb0nWMH8Bqjl1leJSEqgyT94,3611
-dbhydra/src/tables.py,sha256=F_WEookoyjv4r9HGfWdCquCc9MP5vH3vfonBPKNRQ3k,47184
-dbhydra/src/xlsx_db.py,sha256=z6d-IjMYMmXC591Mt5DcxIYWyluanjPRFd-sXtjjXww,3514
+dbhydra/src/tables.py,sha256=v2VxgjKiNQyCdQCuovhpeDklPaqOcPRssTAP0mF2jTw,47613
+dbhydra/src/xlsx_db.py,sha256=deLmOXu3ZuM4a2Fzf7LLcdYG8JQIfULaLd4jZzMnceo,3539
 dbhydra/src/errors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbhydra/src/errors/exceptions.py,sha256=LVpfbTd3NHfQIM-D5TFAU6hOZwGQ3b5DwFD4B6vtf2U,149
 dbhydra/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbhydra/tests/test_cases.py,sha256=eAFGaHaIaab3md3HHm2_ryb_HHfObtcXDAEzLh4qWx8,508
 dbhydra/tests/test_mongo.py,sha256=M8TD72M0iQAk7ZcLTWwLmcmmF_zwALnYEGTWjhQlq0s,1979
 dbhydra/tests/test_sql.py,sha256=aPFXyA0jh8o9VG3B5f9fNz7qDbuVPZ9TcE2twn5dAeQ,3126
-dbhydra-2.2.8.dist-info/LICENSE,sha256=k49Yga8CP889JJaHlOpGFzr_be2nqMoep2chYeIDctk,1091
-dbhydra-2.2.8.dist-info/METADATA,sha256=oHsjGJM9YAxfzovKPp2Nlwy9jqomXk1FZzuGBEEgWlM,2298
-dbhydra-2.2.8.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-dbhydra-2.2.8.dist-info/top_level.txt,sha256=oO4Gf1T8_txIsIlp11GI0k7PtBIMb9GRwb5ObF4MLVg,8
-dbhydra-2.2.8.dist-info/RECORD,,
+dbhydra-2.2.9.dist-info/LICENSE,sha256=k49Yga8CP889JJaHlOpGFzr_be2nqMoep2chYeIDctk,1091
+dbhydra-2.2.9.dist-info/METADATA,sha256=ZNribd9pDJrRIwRa80kNK4m5sWC1Sl_96xCp97psRao,2298
+dbhydra-2.2.9.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+dbhydra-2.2.9.dist-info/top_level.txt,sha256=oO4Gf1T8_txIsIlp11GI0k7PtBIMb9GRwb5ObF4MLVg,8
+dbhydra-2.2.9.dist-info/RECORD,,