keboola.component 1.9.4__tar.gz → 1.11.0__tar.gz

{keboola_component-1.9.4/src/keboola.component.egg-info → keboola_component-1.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: keboola.component
-Version: 1.9.4
+Version: 1.11.0
 Summary: General library for Python applications running in Keboola Connection environment
 Author-email: Keboola KDS Team <support@keboola.com>
 License-Expression: MIT

{keboola_component-1.9.4 → keboola_component-1.11.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "keboola.component"
-version = "1.9.4"  # replaced by the actual version based on the release tag in github actions
+version = "1.11.0"  # replaced by the actual version based on the release tag in github actions
 dependencies = [
     "pygelf",
     "deprecated",

{keboola_component-1.9.4 → keboola_component-1.11.0}/src/keboola/component/dao.py

@@ -162,11 +162,6 @@ class TableMetadata:
 
         """
 
-        if manifest.get("schema") and (
-            manifest.get("metadata") or manifest.get("column_metadata") or manifest.get("columns")
-        ):  # noqa
-            raise UserException("Manifest can't contain new 'schema' and old 'metadata'/'column_metadata'/'columns'")
-
         if not manifest.get("schema"):
             # column metadata
             for column, metadata_list in manifest.get("column_metadata", {}).items():

{keboola_component-1.9.4 → keboola_component-1.11.0}/src/keboola/component/interface.py

@@ -160,18 +160,22 @@ class CommonInterface:
 
         hd1 = logging.StreamHandler(sys.stdout)
         hd1.addFilter(InfoFilter())
+        hd1._keboola_owned = True
         hd2 = logging.StreamHandler(sys.stderr)
         hd2.setLevel(logging.WARNING)
+        hd2._keboola_owned = True
 
-        logging.getLogger().setLevel(log_level)
-        # remove default handler
-        for h in logging.getLogger().handlers:
-            logging.getLogger().removeHandler(h)
-        logging.getLogger().addHandler(hd1)
-        logging.getLogger().addHandler(hd2)
+        root = logging.getLogger()
+        root.setLevel(log_level)
+        # Remove only handlers previously installed by keboola.component, leaving
+        # any external handlers (e.g. test infrastructure) untouched.
+        for h in list(root.handlers):
+            if getattr(h, "_keboola_owned", False):
+                root.removeHandler(h)
+        root.addHandler(hd1)
+        root.addHandler(hd2)
 
-        logger = logging.getLogger()
-        return logger
+        return root
 
     @staticmethod
     def set_gelf_logger(
@@ -192,9 +196,11 @@ class CommonInterface:
 
         Returns: Logger object
         """
-        # remove existing handlers
-        for h in logging.getLogger().handlers:
-            logging.getLogger().removeHandler(h)
+        # Remove only handlers previously installed by keboola.component.
+        root = logging.getLogger()
+        for h in list(root.handlers):
+            if getattr(h, "_keboola_owned", False):
+                root.removeHandler(h)
         if stdout:
             CommonInterface.set_default_logger(log_level)
 
@@ -210,6 +216,7 @@ class CommonInterface:
         else:
             raise ValueError(f"Unsupported gelf transport layer: {transport_layer}. Choose TCP or UDP")
 
+        gelf._keboola_owned = True
         logging.getLogger().setLevel(log_level)
         logging.getLogger().addHandler(gelf)
 

{keboola_component-1.9.4 → keboola_component-1.11.0/src/keboola.component.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: keboola.component
-Version: 1.9.4
+Version: 1.11.0
 Summary: General library for Python applications running in Keboola Connection environment
 Author-email: Keboola KDS Team <support@keboola.com>
 License-Expression: MIT

{keboola_component-1.9.4 → keboola_component-1.11.0}/tests/test_dao.py

@@ -122,6 +122,29 @@ class TestTableMetadata(unittest.TestCase):
         self.assertEqual(table_metadata.column_metadata, expected_tmetadata.column_metadata)
         self.assertEqual(table_metadata.table_metadata, expected_tmetadata.table_metadata)
 
+    def test_build_from_manifest_with_schema_and_legacy_keys_valid(self):
+        # Input manifests produced by the platform carry the new `schema` node alongside the legacy
+        # `columns`/`metadata`/`column_metadata` keys for backward compatibility. The library must accept this:
+        # `schema` is the source of truth for columns, while legacy table `metadata` is still loaded.
+        raw_manifest = {
+            "id": "in.c-bucket.table",
+            "columns": ["foo", "bar"],
+            "primary_key": ["foo"],
+            "metadata": [{"key": "bar", "value": "kochba"}],
+            "column_metadata": {"bar": [{"key": "foo", "value": "gogo"}]},
+            "schema": [
+                {"name": "foo", "data_type": {"base": {"type": "STRING"}}, "nullable": False, "primary_key": True},
+                {"name": "bar", "data_type": {"base": {"type": "STRING"}}, "nullable": True},
+            ],
+        }
+
+        table_metadata = TableMetadata(raw_manifest)
+
+        # column metadata comes from `schema`, not the legacy `column_metadata` block
+        self.assertEqual(table_metadata.column_metadata, {})
+        # table-level legacy metadata is still loaded
+        self.assertEqual(table_metadata.table_metadata, {"bar": "kochba"})
+
     def test_build_manifest_legacy_none_metadata_skipped(self):
         table_def = TableDefinition(
             "testDef",