cloe-nessy 0.3.11.1b0__py3-none-any.whl → 0.3.11.2b0__py3-none-any.whl

cloe_nessy/models/table.py

@@ -1,3 +1,4 @@
+# type: ignore
 from pathlib import Path
 from typing import Any, Self
 
@@ -13,9 +14,12 @@ from pydantic import (
 )
 
 try:
-    from importlib.resources import files
+    from importlib.resources import files  # type: ignore[attr-defined]
 except ImportError:
-    from importlib_resources import files  # Python < 3.9 fallback
+    try:
+        from importlib_resources import files  # type: ignore[import-untyped]
+    except ImportError:
+        files = None  # type: ignore[assignment]
 
 from ..logging import LoggerMixin
 from ..utils.file_and_directory_handler import process_path
@@ -252,26 +256,61 @@ class Table(TemplateLoaderMixin, ReadInstancesMixin, LoggerMixin):
         Raises:
             TemplateNotFound: If the template file is not found.
         """
-        # Use importlib.resources for robust template loading
-        try:
-            template_files = files("cloe_nessy.models") / "templates"
-            template_content = (template_files / "create_table.sql.j2").read_text()
+        template_name = "create_table.sql.j2"
+        template = None
+
+        # Approach 1: Try importlib.resources (recommended for Python 3.9+)
+        if files is not None:
+            try:
+                template_files = files("cloe_nessy.models") / "templates"
+                template_content = (template_files / template_name).read_text()
+
+                from jinja2 import BaseLoader, Environment
 
-            # Create template directly from string content
-            from jinja2 import BaseLoader, Environment
+                env = Environment(loader=BaseLoader(), keep_trailing_newline=True)
+                template = env.from_string(template_content)
 
-            env = Environment(loader=BaseLoader(), keep_trailing_newline=True)
-            template = env.from_string(template_content)
+            except (FileNotFoundError, AttributeError, ImportError):
+                pass  # Try next approach
+
+        # Approach 2: Try relative to __file__ (development/editable install)
+        if template is None:
+            try:
+                templates = Path(__file__).parent / "templates"
+                template = self.get_template(templates, template_name)
+            except TemplateNotFound:
+                pass  # Try next approach
 
-        except (FileNotFoundError, AttributeError):
-            # Fallback to the old method if importlib.resources fails
-            templates = Path(__file__).parent / "templates"
-            template_name = "create_table.sql.j2"
+        # Approach 3: Try relative to module location
+        if template is None:
             try:
+                import cloe_nessy.models
+
+                module_path = Path(cloe_nessy.models.__file__).parent
+                templates = module_path / "templates"
                 template = self.get_template(templates, template_name)
-            except TemplateNotFound as template_err:
-                self._console_logger.error(f"Template [ {template_name} ] not found.")
-                raise template_err
+            except (TemplateNotFound, AttributeError):
+                pass  # Try next approach
+
+        # Approach 4: Last resort - search in package data
+        if template is None:
+            try:
+                import pkg_resources
+
+                template_content = pkg_resources.resource_string(
+                    "cloe_nessy.models", f"templates/{template_name}"
+                ).decode("utf-8")
+
+                from jinja2 import BaseLoader, Environment
+
+                env = Environment(loader=BaseLoader(), keep_trailing_newline=True)
+                template = env.from_string(template_content)
+            except (ImportError, FileNotFoundError):
+                pass  # All approaches failed
+
+        if template is None:
+            self._console_logger.error(f"Template [ {template_name} ] not found in any location.")
+            raise TemplateNotFound(template_name)
 
         render = template.render(table=self, replace=replace)
         return render

cloe_nessy/models/templates/create_table.sql.j2

@@ -0,0 +1,36 @@
+CREATE {% if replace %}OR REPLACE {% endif %}{% if table.is_external %}EXTERNAL {% endif -%}
+TABLE {%- if not replace %} IF NOT EXISTS{% endif %} {{ table.escaped_identifier }} {% if table.columns %}( {% endif %}
+{%- for column in table.columns %}
+    {% if not loop.first %}, {% endif -%}
+    {{column.name}} {{column.data_type|upper}}
+    {%- if not column.nullable %} NOT NULL{% endif -%}
+    {%- if column.default_value %} DEFAULT {{column.default_value}}{% endif -%}
+    {%- if column.comment %} COMMENT '{{column.comment}}'{% endif -%}
+    {%- if column.generated %} GENERATED {{column.generated}}{% endif -%}
+{% endfor %}
+{% if table.columns %}) {% endif %}
+USING delta
+{% if table.storage_path %}
+LOCATION '{{ table.storage_path }}'
+{% endif %}
+{% if table.partition_by -%}
+    {%- if table.liquid_clustering -%} CLUSTER {%- else -%} PARTITIONED {%- endif %} BY (
+        {%- for column in table.partition_by -%}
+            {%- if not loop.first %}, {% endif -%}
+            {{column}}
+        {%- endfor -%}
+    )
+{%- endif -%}
+;
+{%- for constraint in table.constraints %}
+ALTER TABLE {{ table.escaped_identifier }} ADD CONSTRAINT {{constraint.name}} CHECK ({{constraint.expression}});
+{%- endfor -%}
+
+{%- for fk in table.foreign_keys %}
+    ALTER TABLE {{ table.escaped_identifier }} ADD CONSTRAINT {{table.name}}__{{fk.parent_table|replace(".","_")}}__{{fk.foreign_key_columns|join("_")}} FOREIGN KEY ({{fk.foreign_key_columns|join(", ")}}) REFERENCES {{fk.parent_table}}({{fk.parent_columns|join(", ")}})
+    NOT ENFORCED NORELY;
+{%- endfor %}
+
+{%- if table.comment %}
+COMMENT ON TABLE {{ table.escaped_identifier }} IS '{{ table.comment }}';
+{%- endif %}

cloe_nessy/models/templates/create_volume.sql.j2

@@ -0,0 +1,3 @@
+CREATE{% if volume.storage_path %} EXTERNAL{% endif %} VOLUME{% if if_not_exists %} IF NOT EXISTS{% endif %} {{ volume.escaped_identifier }}
+{%- if volume.storage_path %} LOCATION '{{ volume.storage_path }}'{% endif -%}
+{%- if volume.comment %} COMMENT '{{ volume.comment }}'{% endif -%};

cloe_nessy/models/volume.py

@@ -5,9 +5,14 @@ from jinja2 import TemplateNotFound
 from pydantic import BaseModel, field_validator
 
 try:
-    from importlib.resources import files
+    from importlib.resources import files  # type: ignore[attr-defined]
 except ImportError:
-    from importlib_resources import files  # Python < 3.9 fallback
+    try:
+        from importlib_resources import files as importlib_resources_files  # type: ignore[import-untyped]
+
+        files = importlib_resources_files
+    except ImportError:
+        files = None  # type: ignore[assignment]
 
 from ..logging import LoggerMixin
 from .mixins.template_loader_mixin import TemplateLoaderMixin
@@ -69,26 +74,61 @@ class Volume(TemplateLoaderMixin, LoggerMixin, BaseModel):
         Returns:
                 The rendered create statement as a string.
         """
-        # Use importlib.resources for robust template loading
-        try:
-            template_files = files("cloe_nessy.models") / "templates"
-            template_content = (template_files / "create_volume.sql.j2").read_text()
+        template_name = "create_volume.sql.j2"
+        template = None
+
+        # Approach 1: Try importlib.resources (recommended for Python 3.9+)
+        if files is not None:
+            try:
+                template_files = files("cloe_nessy.models") / "templates"
+                template_content = (template_files / template_name).read_text()
+
+                from jinja2 import BaseLoader, Environment
 
-            # Create template directly from string content
-            from jinja2 import BaseLoader, Environment
+                env = Environment(loader=BaseLoader(), keep_trailing_newline=True)
+                template = env.from_string(template_content)
 
-            env = Environment(loader=BaseLoader(), keep_trailing_newline=True)
-            template = env.from_string(template_content)
+            except (FileNotFoundError, AttributeError, ImportError):
+                pass  # Try next approach
+
+        # Approach 2: Try relative to __file__ (development/editable install)
+        if template is None:
+            try:
+                templates = Path(__file__).parent / "templates"
+                template = self.get_template(templates, template_name)
+            except TemplateNotFound:
+                pass  # Try next approach
 
-        except (FileNotFoundError, AttributeError):
-            # Fallback to the old method if importlib.resources fails
-            template_name = "create_volume.sql.j2"
-            templates = Path(__file__).parent / "templates"
+        # Approach 3: Try relative to module location
+        if template is None:
             try:
+                import cloe_nessy.models
+
+                module_path = Path(cloe_nessy.models.__file__).parent
+                templates = module_path / "templates"
                 template = self.get_template(templates, template_name)
-            except TemplateNotFound as template_err:
-                self._console_logger.error(f"Template [ {template_name} ] not found.")
-                raise template_err
+            except (TemplateNotFound, AttributeError):
+                pass  # Try next approach
+
+        # Approach 4: Last resort - search in package data
+        if template is None:
+            try:
+                import pkg_resources
+
+                template_content = pkg_resources.resource_string(
+                    "cloe_nessy.models", f"templates/{template_name}"
+                ).decode("utf-8")
+
+                from jinja2 import BaseLoader, Environment
+
+                env = Environment(loader=BaseLoader(), keep_trailing_newline=True)
+                template = env.from_string(template_content)
+            except (ImportError, FileNotFoundError):
+                pass  # All approaches failed
+
+        if template is None:
+            self._console_logger.error(f"Template [ {template_name} ] not found in any location.")
+            raise TemplateNotFound(template_name)
 
         render = template.render(volume=self, if_not_exists=if_not_exists)
         return render

{cloe_nessy-0.3.11.1b0.dist-info → cloe_nessy-0.3.11.2b0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloe-nessy
-Version: 0.3.11.1b0
+Version: 0.3.11.2b0
 Summary: Your friendly datalake monster.
 Author-email: initions <ICSMC_EXT_PYPIORG@accenture.com>
 License: MIT

{cloe_nessy-0.3.11.1b0.dist-info → cloe_nessy-0.3.11.2b0.dist-info}/RECORD

@@ -42,14 +42,16 @@ cloe_nessy/models/column.py,sha256=53fBwRnino72XKACsHZpN9QfCBqqSXyKLHZlM0huumg,1
 cloe_nessy/models/constraint.py,sha256=hsFlhn4n928z81O3dl3v5bMetewPWzMjkJK3_4kASSM,178
 cloe_nessy/models/foreign_key.py,sha256=DwRVHs9sShqqPV-NL7ow_3AmPPWX0Od26yZn_I565pU,1001
 cloe_nessy/models/schema.py,sha256=yUrjjEhAH5zbCymE67Az_jPnVB8hGO-_UNfqzeZCD_Y,3376
-cloe_nessy/models/table.py,sha256=zw1Ika_dQCBNla60EGCo0PlkbLqJ1jp4orD28BLTV18,12861
+cloe_nessy/models/table.py,sha256=D3kkPG_iqOcCuOKSCcgj34Xf9fLMTspNK28hPn07Xtc,14258
 cloe_nessy/models/types.py,sha256=XRbuJGdTNa6aXyE3IAzs_J9gVjbfkzMDLfGl-k6jI_4,223
-cloe_nessy/models/volume.py,sha256=su_r0pzKf58qzkga9XJyObIb36V3_4rDWxc8fXbdS2U,3225
+cloe_nessy/models/volume.py,sha256=OnpwVej2o_JTHG3R09EJRFQcCUBNo3VPLR6GgKoCsYc,4678
 cloe_nessy/models/adapter/__init__.py,sha256=m36W_mqwB3dCYnCIt0fLOSHS4E1VU8FRGoaum4Gf95o,90
 cloe_nessy/models/adapter/unity_catalog_adapter.py,sha256=a-14Ys-AevVYQd0xeJU1syLxjT5Wzo4uog1hFSEs76M,12651
 cloe_nessy/models/mixins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloe_nessy/models/mixins/read_instance_mixin.py,sha256=j5Y4aNWOh1jlskEaxNooZFJgPyxRmik00gAVLJnAaRs,4507
 cloe_nessy/models/mixins/template_loader_mixin.py,sha256=5MXhEGBFlq3dwZvINEyBowSlipNnVun2H_TmhI_fsS4,549
+cloe_nessy/models/templates/create_table.sql.j2,sha256=QWbiTXwmGaIlZUAIGL4pAlHkDbP9mq1vGAkdKCPOqm4,1669
+cloe_nessy/models/templates/create_volume.sql.j2,sha256=XIUf1cHcvAxcGTyhzUiv4xpQ1cfDw_ra3_FKmOuLoBs,289
 cloe_nessy/object_manager/__init__.py,sha256=3sle0vNpPwBOkycxA3XVS9m4XZf5LD3Qd4NGxdqcHno,186
 cloe_nessy/object_manager/table_manager.py,sha256=oYcYiZR0-JyoadcCcDelxfFb-ATeKDIZerYaZc-moiI,12634
 cloe_nessy/object_manager/volume_manager.py,sha256=6epd3KXzcNH04EvaKubAfLsaUm9qBMeT3KNvMK04gGs,2727
@@ -92,7 +94,7 @@ cloe_nessy/settings/__init__.py,sha256=ZbkneO3WaKOxon7qHFHnou7EnBOSnBFyKMDZblIEv
 cloe_nessy/settings/settings.py,sha256=I4n129lrujriW-d8q4as2Kb4_kI932ModfZ5Ow_UpVM,3653
 cloe_nessy/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloe_nessy/utils/file_and_directory_handler.py,sha256=r2EVt9xG81p6ScaJCwETC5an6pMT6WseB0jMOR-JlpU,602
-cloe_nessy-0.3.11.1b0.dist-info/METADATA,sha256=ugc1ty-RCAN4gpYDV6l0iOldlxVnx0T61YsiSvPi4PM,3166
-cloe_nessy-0.3.11.1b0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cloe_nessy-0.3.11.1b0.dist-info/top_level.txt,sha256=Z7izn8HmQpg2wBUb-0jzaKlYKMU7Ypzuc9__9vPtW_I,11
-cloe_nessy-0.3.11.1b0.dist-info/RECORD,,
+cloe_nessy-0.3.11.2b0.dist-info/METADATA,sha256=pjkK299KMeCos76S2Vj_3k8E7sFY6narDkE8472nfQY,3166
+cloe_nessy-0.3.11.2b0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cloe_nessy-0.3.11.2b0.dist-info/top_level.txt,sha256=Z7izn8HmQpg2wBUb-0jzaKlYKMU7Ypzuc9__9vPtW_I,11
+cloe_nessy-0.3.11.2b0.dist-info/RECORD,,