clickzetta-semantic-model-generator 1.0.11__py3-none-any.whl → 1.0.13__py3-none-any.whl

{clickzetta_semantic_model_generator-1.0.11.dist-info → clickzetta_semantic_model_generator-1.0.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: clickzetta-semantic-model-generator
-Version: 1.0.11
+Version: 1.0.13
 Summary: Curate a Semantic Model for ClickZetta Lakehouse
 License: Apache Software License; BSD License
 Author: qililiang

{clickzetta_semantic_model_generator-1.0.11.dist-info → clickzetta_semantic_model_generator-1.0.13.dist-info}/RECORD

@@ -1,5 +1,5 @@
 semantic_model_generator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-semantic_model_generator/clickzetta_utils/clickzetta_connector.py,sha256=LfudaByoNX8rBe1BYYhgXL7eFWC2H5tBhuivwCfn1iA,35428
+semantic_model_generator/clickzetta_utils/clickzetta_connector.py,sha256=CwmO0kjQRujtDBaikjUY2h9Y28i4Ui--ojtB5Nr7XJs,36033
 semantic_model_generator/clickzetta_utils/env_vars.py,sha256=8cbL6R75c1-aVQ2i1TDr9SiHCUjTrgvXbIRz4MbcmbE,7664
 semantic_model_generator/clickzetta_utils/utils.py,sha256=UBfWy9qOTyut8tL02gOHHbh6Uz8RqRz5Mm2YdKWFN54,4950
 semantic_model_generator/data_processing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -32,7 +32,7 @@ semantic_model_generator/validate/context_length.py,sha256=HL-GfaRXNcVji1-pAFGXG
 semantic_model_generator/validate/keywords.py,sha256=frZ5HjRXP69K6dYAU5_d86oSp40_3yoLUg1eQwU3oLM,7080
 semantic_model_generator/validate/schema.py,sha256=eL_wl5yscIeczwNBRUKhF_7QqWW2wSGimkgaOhMFsrA,5893
 semantic_model_generator/validate_model.py,sha256=Uq-V-GfPeF2Dy4l9uF5Guv104gDCDGh0Cxz1AJOu5dk,836
-clickzetta_semantic_model_generator-1.0.11.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-clickzetta_semantic_model_generator-1.0.11.dist-info/METADATA,sha256=redlqh04BYGLtGTzRYRL9TFjAGEpmDRdrStQrOtwT5E,7817
-clickzetta_semantic_model_generator-1.0.11.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-clickzetta_semantic_model_generator-1.0.11.dist-info/RECORD,,
+clickzetta_semantic_model_generator-1.0.13.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+clickzetta_semantic_model_generator-1.0.13.dist-info/METADATA,sha256=eWxK-U7IaduyEYAHMppEJx_DxDaTDdgQJPoed52fu-s,7817
+clickzetta_semantic_model_generator-1.0.13.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+clickzetta_semantic_model_generator-1.0.13.dist-info/RECORD,,

semantic_model_generator/clickzetta_utils/clickzetta_connector.py

@@ -482,42 +482,59 @@ def _fetch_columns_via_show(
     rows: List[pd.DataFrame] = []
     category = _catalog_category(session, workspace)
     is_shared_catalog = category == "SHARED"
-    catalog = workspace if is_shared_catalog else workspace.upper()
+    catalog = workspace
     schema_token = table_schema or ""
-    if schema_token and not is_shared_catalog:
-        schema_token = schema_token.upper()
 
     for table_name in table_names:
         table_token = str(table_name).strip()
         if not table_token:
             continue
-        qualified_table = join_quoted_identifiers(
+
+        identifier_candidates: List[str] = []
+        fully_qualified = join_quoted_identifiers(
             *(part for part in (catalog, schema_token, table_token) if part)
         )
-        query = f"SHOW COLUMNS IN {qualified_table}"
-        df_source = "SHOW COLUMNS"
-        try:
-            df = session.sql(query).to_pandas()
-        except Exception as exc:
-            logger.debug(
-                "SHOW COLUMNS fallback failed for {}: {}", qualified_table, exc
-            )
-            df = pd.DataFrame()
-        if df.empty:
-            describe_query = f"DESCRIBE TABLE {qualified_table}"
+        if fully_qualified:
+            identifier_candidates.append(fully_qualified)
+        schema_qualified = (
+            join_quoted_identifiers(schema_token, table_token)
+            if schema_token
+            else ""
+        )
+        if schema_qualified:
+            identifier_candidates.append(schema_qualified)
+        bare_identifier = join_quoted_identifiers(table_token)
+        if bare_identifier:
+            identifier_candidates.append(bare_identifier)
+
+        df = pd.DataFrame()
+        df_source = ""
+        for identifier in identifier_candidates:
+            query = f"SHOW COLUMNS IN {identifier}"
             try:
-                describe_df = session.sql(describe_query).to_pandas()
+                df = session.sql(query).to_pandas()
+                df_source = "SHOW COLUMNS"
             except Exception as exc:
                 logger.debug(
-                    "DESCRIBE TABLE fallback failed for {}: {}", qualified_table, exc
+                    "SHOW COLUMNS fallback failed for {}: {}", identifier, exc
                 )
-                describe_df = pd.DataFrame()
-            if not describe_df.empty:
-                df_source = "DESCRIBE TABLE"
-                df = describe_df
+                df = pd.DataFrame()
+            if df.empty:
+                describe_query = f"DESCRIBE TABLE {identifier}"
+                try:
+                    describe_df = session.sql(describe_query).to_pandas()
+                except Exception as exc:
+                    logger.debug(
+                        "DESCRIBE TABLE fallback failed for {}: {}", identifier, exc
+                    )
+                    describe_df = pd.DataFrame()
+                if not describe_df.empty:
+                    df = describe_df
+                    df_source = "DESCRIBE TABLE"
+            if not df.empty:
+                break
         if df.empty:
             continue
-        df.columns = [str(col).upper() for col in df.columns]
         if df_source == "DESCRIBE TABLE":
             if "KIND" in df.columns:
                 df = df[df["KIND"].astype(str).str.upper() == "COLUMN"]
@@ -530,6 +547,7 @@ def _fetch_columns_via_show(
                 df = df.rename(columns=rename_map)
             if df.empty:
                 continue
+        df.columns = [str(col).upper() for col in df.columns]
         schema_col = next(
             (col for col in ("TABLE_SCHEMA", "SCHEMA_NAME") if col in df.columns), None
         )