duckrun 0.2.5.dev1__py3-none-any.whl → 0.2.5.dev2__py3-none-any.whl

duckrun/core.py

@@ -61,10 +61,20 @@ class Duckrun:
         self.scan_all_schemas = scan_all_schemas
         self.storage_account = storage_account
         
-        # Construct proper ABFSS URLs using GUIDs
-        # Both Tables and Files use lakehouse GUID directly (no .Lakehouse suffix)
-        self.table_base_url = f'abfss://{workspace_id}@{storage_account}.dfs.fabric.microsoft.com/{lakehouse_id}/Tables/'
-        self.files_base_url = f'abfss://{workspace_id}@{storage_account}.dfs.fabric.microsoft.com/{lakehouse_id}/Files/'
+        # Construct proper ABFSS URLs
+        import re
+        guid_pattern = re.compile(r'^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$', re.IGNORECASE)
+        # If lakehouse_id is a GUID, use as-is
+        if guid_pattern.match(lakehouse_id):
+            lakehouse_url_part = lakehouse_id
+        else:
+            # If workspace name has no spaces, always append .lakehouse unless already present
+            if " " not in workspace_id and not lakehouse_id.endswith('.lakehouse'):
+                lakehouse_url_part = f'{lakehouse_id}.lakehouse'
+            else:
+                lakehouse_url_part = lakehouse_id
+        self.table_base_url = f'abfss://{workspace_id}@{storage_account}.dfs.fabric.microsoft.com/{lakehouse_url_part}/Tables/'
+        self.files_base_url = f'abfss://{workspace_id}@{storage_account}.dfs.fabric.microsoft.com/{lakehouse_url_part}/Files/'
         
         # Keep legacy properties for backward compatibility
         self.workspace = workspace_id  
@@ -326,7 +336,19 @@ class Duckrun:
         url = f"abfss://{self.workspace}@{self.storage_account}.dfs.fabric.microsoft.com/"
         store = AzureStore.from_url(url, bearer_token=token)
         
-        base_path = f"{self.lakehouse_name}/Tables/"
+        # Use the same lakehouse URL part logic as in __init__ to ensure .lakehouse suffix is added when needed
+        import re
+        guid_pattern = re.compile(r'^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$', re.IGNORECASE)
+        if guid_pattern.match(self.lakehouse_id):
+            lakehouse_url_part = self.lakehouse_id
+        else:
+            # If workspace name has no spaces, always append .lakehouse unless already present
+            if " " not in self.workspace_id and not self.lakehouse_id.endswith('.lakehouse'):
+                lakehouse_url_part = f'{self.lakehouse_id}.lakehouse'
+            else:
+                lakehouse_url_part = self.lakehouse_id
+        
+        base_path = f"{lakehouse_url_part}/Tables/"
         tables_found = []
         
         if self.scan_all_schemas:

{duckrun-0.2.5.dev1.dist-info → duckrun-0.2.5.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: duckrun
-Version: 0.2.5.dev1
+Version: 0.2.5.dev2
 Summary: Lakehouse task runner powered by DuckDB for Microsoft Fabric
 Author: mim
 License: MIT

{duckrun-0.2.5.dev1.dist-info → duckrun-0.2.5.dev2.dist-info}/RECORD

@@ -1,12 +1,12 @@
 duckrun/__init__.py,sha256=XA85pL2vK1AkmBic8e7WxeqNvcd6SjFX4zsQpImDO6E,230
-duckrun/core.py,sha256=-UAsAOlOmVkVuQCkbCWTH7aiFSHP0OenAAWSl0i0inY,37107
+duckrun/core.py,sha256=UgBE90zTFvnieTrUEb4tDA2cWSwFfh24M_e46FTmFvg,38345
 duckrun/files.py,sha256=piWRU5w9jHrW-wuV4Gf-SKY_jhFv9eflxgWO8AZCQTI,10495
 duckrun/lakehouse.py,sha256=j--Z3zo8AOWt1GF9VzRosmmTAy6ey2D0LVubti58twU,14109
 duckrun/runner.py,sha256=lfwNoU1CZXh6bPTHvGWVaUWjzG5crvT7Pzq4onMEVjw,12576
 duckrun/stats.py,sha256=2FTqoQNVjD84-H1HjStHxZkOpAGKXS79M55B00pOlok,9804
 duckrun/writer.py,sha256=eWrGtDQTbXi8H3sSt2WucYTdEQUjK97KmQxzCbqAuMs,6221
-duckrun-0.2.5.dev1.dist-info/licenses/LICENSE,sha256=-DeQQwdbCbkB4507ZF3QbocysB-EIjDtaLexvqRkGZc,1083
-duckrun-0.2.5.dev1.dist-info/METADATA,sha256=ZQfd7I-J08MC5ytjKt789PqHdroHI0ld36aMNp-57yE,18344
-duckrun-0.2.5.dev1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-duckrun-0.2.5.dev1.dist-info/top_level.txt,sha256=BknMEwebbUHrVAp3SC92ps8MPhK7XSYsaogTvi_DmEU,8
-duckrun-0.2.5.dev1.dist-info/RECORD,,
+duckrun-0.2.5.dev2.dist-info/licenses/LICENSE,sha256=-DeQQwdbCbkB4507ZF3QbocysB-EIjDtaLexvqRkGZc,1083
+duckrun-0.2.5.dev2.dist-info/METADATA,sha256=wiB12-pG_jlyUbghVNMyE3KHcwt8GFJd04VNZ2C4VwE,18344
+duckrun-0.2.5.dev2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+duckrun-0.2.5.dev2.dist-info/top_level.txt,sha256=BknMEwebbUHrVAp3SC92ps8MPhK7XSYsaogTvi_DmEU,8
+duckrun-0.2.5.dev2.dist-info/RECORD,,