dbhydra 2.2.8__tar.gz → 2.2.10__tar.gz

{dbhydra-2.2.8 → dbhydra-2.2.10}/PKG-INFO

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

{dbhydra-2.2.8 → dbhydra-2.2.10}/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-2.2.8 → dbhydra-2.2.10}/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-2.2.8 → dbhydra-2.2.10}/dbhydra/src/abstract_table.py

@@ -1,3 +1,4 @@
+import binascii
 import pandas as pd
 from typing import Optional, Any
 import numpy as np
@@ -317,6 +318,10 @@ class AbstractTable(AbstractJoinable, abc.ABC):
                 column_value_string += f"{quote}{column_name}{quote} = '{cell_value}', "
             elif column_type in ["json", "text", "mediumtext", "longtext", "datetime"]:
                 column_value_string += f"{quote}{column_name}{quote} = '{cell_value}', "
+            elif 'blob' in column_type:
+                # Convert to hex to allow insertion into SQL query
+                hex_data = binascii.hexlify(cell_value).decode('ascii')
+                column_value_string += f"{quote}{column_name}{quote} = UNHEX('{hex_data}'), "
             else:
                 raise AttributeError(f"Unknown column type '{column_type}'")
 

{dbhydra-2.2.8 → dbhydra-2.2.10}/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-2.2.8 → dbhydra-2.2.10}/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-2.2.8 → dbhydra-2.2.10}/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 → dbhydra-2.2.10}/dbhydra.egg-info/PKG-INFO

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

{dbhydra-2.2.8 → dbhydra-2.2.10}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
     
 setuptools.setup(
     name='dbhydra',
-    version='2.2.8',
+    version='2.2.10',
     author='DovaX',
     author_email='dovax.ai@gmail.com',
     description='Data science friendly ORM combining Python',