dbhydra 2.0.11__tar.gz → 2.0.13__tar.gz

{dbhydra-2.0.11 → dbhydra-2.0.13}/PKG-INFO

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

{dbhydra-2.0.11 → dbhydra-2.0.13}/dbhydra/src/abstract_table.py

@@ -238,8 +238,12 @@ class AbstractTable(AbstractJoinable, abc.ABC):
         super().__init__(db1, name, columns)
         self.types: list[str] = types #[] if types is None else types - is wrong, if types not initialized it should be None, not empty list
         self.id_column_name: str = id_column_name
-        assert len(self.columns) == len(self.types)
-        self.column_type_dict={self.columns[i]:self.types[i] for i,x in enumerate(self.columns)}
+        if self.columns is not None and self.types is not None:
+            assert len(self.columns) == len(self.types) 
+            self.column_type_dict={self.columns[i]:self.types[i] for i,x in enumerate(self.columns)}
+        else:
+            self.column_type_dict={}
+        
 
     # Temporary disabled, please make sure this is implemented where needed, don't introduce breaking changes please
     # @abc.abstractmethod

{dbhydra-2.0.11 → dbhydra-2.0.13}/dbhydra/src/mysql_db.py

@@ -57,11 +57,11 @@ class MysqlDb(AbstractDb):
         tables = [x[0] for x in rows]
         return (tables)
 
-    def generate_table_dict(self):
+    def generate_table_dict(self, id_column_name = "id"):
         tables = self.get_all_tables()
         table_dict = dict()
         for i, table in enumerate(tables):
-            table_dict[table] = MysqlTable.init_all_columns(self, table)
+            table_dict[table] = MysqlTable.init_all_columns(self, table, id_column_name)
         return (table_dict)
 
 

{dbhydra-2.0.11 → dbhydra-2.0.13}/dbhydra/src/tables.py

@@ -890,6 +890,39 @@ class XlsxTable(AbstractTable):
         else:
             df.to_excel(self.table_directory_path, index=False)
 
+    def get_all_columns(self):
+        df=self.select_to_df()
+        columns=df.columns.tolist()
+        return(columns)
+
+
+    def get_all_types(self):
+        df=self.select_to_df()
+        dtypes=df.dtypes.tolist() 
+        types = [str(x) for x in dtypes]
+        clean_types=[x.replace("object","str") for x in types] #Todo support more types
+        
+        return(clean_types) 
+  
+    
+    
+    @classmethod
+    def init_all_columns(cls, db1, name, id_column_name="id"):
+        temporary_table = cls(db1, name, id_column_name)
+        columns = temporary_table.get_all_columns()
+        types = temporary_table.get_all_types()
+
+        if temporary_table.id_column_name in columns:
+            id_col_index = columns.index(temporary_table.id_column_name)
+            columns.pop(id_col_index)
+            columns.insert(0, temporary_table.id_column_name)
+            types.pop(id_col_index)
+            types.insert(0, "int")
+
+        return (cls(db1, name, columns, types, id_column_name=id_column_name))    
+
+
+
     def create(self):
         if not self.table_directory_path.exists():
             df = pd.DataFrame(columns=self.columns)

{dbhydra-2.0.11 → dbhydra-2.0.13}/dbhydra/src/xlsx_db.py

@@ -1,6 +1,7 @@
 from dbhydra.src.abstract_db import AbstractDb
 from dbhydra.src.tables import XlsxTable
 
+import contextlib
 import threading
 import pathlib
 import os
@@ -84,7 +85,22 @@ class XlsxDb(AbstractDb):
         except FileExistsError:
             print("Database directory already exists")
 
+    @contextlib.contextmanager
+    def transaction(self):
+        yield None
 
+    def get_all_tables(self):
+        root,dirs,files=next(os.walk(self.db_directory_path))
+        suffix=".csv" if self.is_csv else ".xlsx"
+        tables = [x.lower().replace(suffix,"") for x in files]
+        return (tables)
+
+    def generate_table_dict(self, id_column_name="id"):
+        tables = self.get_all_tables()
+        table_dict = dict()
+        for i, table in enumerate(tables):
+            table_dict[table] = XlsxTable.init_all_columns(self, table, id_column_name)
+        return (table_dict)
 
 
 class XlsxDB(XlsxDb):

{dbhydra-2.0.11 → dbhydra-2.0.13}/dbhydra.egg-info/PKG-INFO

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

{dbhydra-2.0.11 → dbhydra-2.0.13}/setup.py

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