cloe-nessy 0.3.11.3b0__py3-none-any.whl → 0.3.11.5b0__py3-none-any.whl

cloe_nessy/models/table.py

@@ -12,16 +12,6 @@ from pydantic import (
     model_validator,
 )
 
-try:
-    from importlib.resources import files  # type: ignore[attr-defined]
-except ImportError:
-    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 ..utils.file_and_directory_handler import process_path
 from .column import Column
@@ -257,35 +247,14 @@ class Table(TemplateLoaderMixin, ReadInstancesMixin, LoggerMixin):
         Raises:
             TemplateNotFound: If the template file is not found.
         """
+        templates = Path(__file__).parent / "templates"
         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
-
-                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
-
-        if template is None:
-            self._console_logger.error(f"Template [ {template_name} ] not found in any location.")
-            raise TemplateNotFound(template_name)
 
+        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(table=self, replace=replace)
         return render
 

cloe_nessy/models/volume.py

@@ -4,16 +4,6 @@ from typing import Any
 from jinja2 import TemplateNotFound
 from pydantic import BaseModel, field_validator
 
-try:
-    from importlib.resources import files  # type: ignore[attr-defined]
-except ImportError:
-    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
 
@@ -75,29 +65,9 @@ class Volume(TemplateLoaderMixin, LoggerMixin, BaseModel):
                 The rendered create statement as a string.
         """
         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
 
-                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
+        templates = Path(__file__).parent / "templates"
+        template = self.get_template(templates, template_name)
 
         if template is None:
             self._console_logger.error(f"Template [ {template_name} ] not found in any location.")

{cloe_nessy-0.3.11.3b0.dist-info → cloe_nessy-0.3.11.5b0.dist-info}/METADATA

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

{cloe_nessy-0.3.11.3b0.dist-info → cloe_nessy-0.3.11.5b0.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=7CurAjwwzVw-6SQRrEcXtHx8xAvHCoOqIXHlfd_8eVk,13262
+cloe_nessy/models/table.py,sha256=O9vcJ1XBIb6kA-NAI3SNpB5b7MGDo3p4wMJdonPaBfA,12076
 cloe_nessy/models/types.py,sha256=XRbuJGdTNa6aXyE3IAzs_J9gVjbfkzMDLfGl-k6jI_4,223
-cloe_nessy/models/volume.py,sha256=z149VCKIVNkkMv6biOLd_iPdkJnAfWdsLFBhMyCjdCI,3625
+cloe_nessy/models/volume.py,sha256=T1tw08OohuFkSaAA-ToI7Gogm5dY-JZTyeZYJyc5Qks,2457
 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
@@ -94,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.3b0.dist-info/METADATA,sha256=3N7RXNYozN7GedcvTq6i1HHidBtmPat8x0q-bBUFbY4,3166
-cloe_nessy-0.3.11.3b0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cloe_nessy-0.3.11.3b0.dist-info/top_level.txt,sha256=Z7izn8HmQpg2wBUb-0jzaKlYKMU7Ypzuc9__9vPtW_I,11
-cloe_nessy-0.3.11.3b0.dist-info/RECORD,,
+cloe_nessy-0.3.11.5b0.dist-info/METADATA,sha256=ujLV1H3c4aLGooIc3Bmz0uLRsAS6p8eacVwCY3ZGwPw,3166
+cloe_nessy-0.3.11.5b0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cloe_nessy-0.3.11.5b0.dist-info/top_level.txt,sha256=Z7izn8HmQpg2wBUb-0jzaKlYKMU7Ypzuc9__9vPtW_I,11
+cloe_nessy-0.3.11.5b0.dist-info/RECORD,,