cloe-nessy 0.3.9__py3-none-any.whl → 0.3.11.1b0__py3-none-any.whl

cloe_nessy/models/table.py

@@ -12,6 +12,11 @@ from pydantic import (
     model_validator,
 )
 
+try:
+    from importlib.resources import files
+except ImportError:
+    from importlib_resources import files  # Python < 3.9 fallback
+
 from ..logging import LoggerMixin
 from ..utils.file_and_directory_handler import process_path
 from .column import Column
@@ -234,16 +239,40 @@ class Table(TemplateLoaderMixin, ReadInstancesMixin, LoggerMixin):
 
     def get_create_statement(
         self,
-        templates: Path = Path("./src/cloe_nessy/models/templates/"),
-        template_name: str = "create_table.sql.j2",
         replace: bool = True,
     ):
-        """Get the create statement for the Table."""
+        """Get the create statement for the Table.
+
+        Args:
+            replace: Whether to use the REPLACE statement or not.
+
+        Returns:
+            The rendered create statement for the Table.
+
+        Raises:
+            TemplateNotFound: If the template file is not found.
+        """
+        # Use importlib.resources for robust template loading
         try:
-            template = self.get_template(templates, template_name)
-        except TemplateNotFound as err:
-            self._console_logger.error(f"Template [ {template_name} ] not found.")
-            raise err
+            template_files = files("cloe_nessy.models") / "templates"
+            template_content = (template_files / "create_table.sql.j2").read_text()
+
+            # 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)
+
+        except (FileNotFoundError, AttributeError):
+            # Fallback to the old method if importlib.resources fails
+            templates = Path(__file__).parent / "templates"
+            template_name = "create_table.sql.j2"
+            try:
+                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
+
         render = template.render(table=self, replace=replace)
         return render
 

cloe_nessy/models/volume.py

@@ -4,6 +4,11 @@ from typing import Any
 from jinja2 import TemplateNotFound
 from pydantic import BaseModel, field_validator
 
+try:
+    from importlib.resources import files
+except ImportError:
+    from importlib_resources import files  # Python < 3.9 fallback
+
 from ..logging import LoggerMixin
 from .mixins.template_loader_mixin import TemplateLoaderMixin
 
@@ -54,14 +59,36 @@ class Volume(TemplateLoaderMixin, LoggerMixin, BaseModel):
 
     def get_create_statement(
         self,
-        templates: Path = Path("./src/cloe_nessy/models/templates/"),
-        template_name: str = "create_volume.sql.j2",
+        if_not_exists: bool = True,
     ):
-        """Get the create statement for the Volume."""
+        """Get the create statement for the Volume.
+
+        Args:
+            if_not_exists: Whether to include the IF NOT EXISTS clause in the create statement
+
+        Returns:
+                The rendered create statement as a string.
+        """
+        # Use importlib.resources for robust template loading
         try:
-            template = self.get_template(templates, template_name)
-        except TemplateNotFound as err:
-            self._console_logger.error(f"Template [ {template_name} ] not found.")
-            raise err
-        render = template.render(volume=self)
+            template_files = files("cloe_nessy.models") / "templates"
+            template_content = (template_files / "create_volume.sql.j2").read_text()
+
+            # 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)
+
+        except (FileNotFoundError, AttributeError):
+            # Fallback to the old method if importlib.resources fails
+            template_name = "create_volume.sql.j2"
+            templates = Path(__file__).parent / "templates"
+            try:
+                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
+
+        render = template.render(volume=self, if_not_exists=if_not_exists)
         return render

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

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

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

@@ -42,9 +42,9 @@ 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=V1gsne79I-DQ47jTHNhGjWsg4i8io-VC9rv0PjlXDNQ,11848
+cloe_nessy/models/table.py,sha256=zw1Ika_dQCBNla60EGCo0PlkbLqJ1jp4orD28BLTV18,12861
 cloe_nessy/models/types.py,sha256=XRbuJGdTNa6aXyE3IAzs_J9gVjbfkzMDLfGl-k6jI_4,223
-cloe_nessy/models/volume.py,sha256=7_lH4X-Au8jYNRVFQ5F2x-fRy2J8Z5-cLTn3Z3mpLQs,2197
+cloe_nessy/models/volume.py,sha256=su_r0pzKf58qzkga9XJyObIb36V3_4rDWxc8fXbdS2U,3225
 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
@@ -92,7 +92,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.9.dist-info/METADATA,sha256=TUUpWkn2wjKwCwkLdCh0gkmXlebXo6XEEjsvzUs74n8,3161
-cloe_nessy-0.3.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cloe_nessy-0.3.9.dist-info/top_level.txt,sha256=Z7izn8HmQpg2wBUb-0jzaKlYKMU7Ypzuc9__9vPtW_I,11
-cloe_nessy-0.3.9.dist-info/RECORD,,
+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,,