Releases v0.12.2.2

Author: wjsi

odps/_version.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version_info = (0, 12, 2, 1)
+version_info = (0, 12, 2, 2)
 _num_index = max(idx if isinstance(v, int) else 0 for idx, v in enumerate(version_info))
 __version__ = ".".join(map(str, version_info[: _num_index + 1])) + "".join(
     version_info[_num_index + 1 :]

odps/models/tasks/maxframe.py

@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Alibaba Group Holding Ltd.
+# Copyright 1999-2025 Alibaba Group Holding Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 from collections import OrderedDict
 
 from ... import serializers
-from ...compat import enum
+from ...compat import enum, six
 from ...config import options
 from .core import Task
 
@@ -63,5 +63,14 @@ def serial(self):
         if "settings" in self.properties:
             settings.update(json.loads(self.properties["settings"]))
 
-        self.properties["settings"] = json.dumps(settings)
+        final_settings = OrderedDict()
+        for k, v in settings.items():
+            if isinstance(v, six.string_types):
+                final_settings[k] = v
+            elif isinstance(v, bool):
+                final_settings[k] = str(v).lower()
+            else:
+                final_settings[k] = str(v)
+
+        self.properties["settings"] = json.dumps(final_settings)
         return super(MaxFrameTask, self).serial()

odps/models/tasks/sql.py

@@ -29,7 +29,7 @@ def collect_sql_settings(value, glob):
 
     settings = OrderedDict()
     if options.default_task_settings:
-        settings = options.default_task_settings
+        settings.update(options.default_task_settings)
 
     if utils.str_to_bool(os.environ.get("PYODPS_SUBMIT_CLIENT_VERSIONS") or "true"):
         settings["PYODPS_VERSION"] = __version__

odps/models/xflows.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright 1999-2024 Alibaba Group Holding Ltd.
+# Copyright 1999-2025 Alibaba Group Holding Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,6 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import json
+import logging
 import time
 from collections import OrderedDict
 
@@ -23,6 +25,8 @@
 from .instance import Instance
 from .xflow import XFlow
 
+logger = logging.getLogger(__name__)
+
 
 class XFlows(Iterable):
     marker = serializers.XMLNodeField("Marker")
@@ -139,15 +143,31 @@ def run_xflow(
         self, xflow_instance=None, project=None, hints=None, parameters=None, **kw
     ):
         project = project or self.parent
-        hints = hints or {}
+        props = kw.get("properties") or OrderedDict()
+        props.update(hints or {})
         if options.ml.xflow_settings:
-            hints.update(options.ml.xflow_settings)
-        if hints:
-            kw["properties"] = hints
+            props.update(options.ml.xflow_settings)
         if options.biz_id:
-            if kw.get("properties") is None:
-                kw["properties"] = OrderedDict()
-            kw["properties"]["biz_id"] = str(options.biz_id)
+            props["biz_id"] = str(options.biz_id)
+
+        if options.default_task_settings:
+            settings = options.default_task_settings.copy()
+            exist_settings = json.loads(
+                props.get("settings") or "{}", object_pairs_hook=OrderedDict
+            )
+            settings.update(exist_settings)
+            str_settings = OrderedDict()
+            for k, v in settings.items():
+                if isinstance(v, six.string_types):
+                    str_settings[k] = v
+                elif isinstance(v, bool):
+                    str_settings[k] = "true" if v else "false"
+                else:
+                    str_settings[k] = str(v)
+            props["settings"] = json.dumps(str_settings)
+
+        if props:
+            kw["properties"] = props
         if parameters:
             new_params = OrderedDict()
             for k, v in six.iteritems(parameters):
@@ -158,11 +178,15 @@ def run_xflow(
                 else:
                     new_params[k] = v
             parameters = new_params
-        return project.instances.create(
-            xml=self._gen_xflow_instance_xml(
-                xflow_instance=xflow_instance, parameters=parameters, **kw
-            )
+
+        inst_xml = self._gen_xflow_instance_xml(
+            xflow_instance=xflow_instance, parameters=parameters, **kw
         )
+        try:
+            return project.instances.create(xml=inst_xml)
+        except:
+            logger.error("Failed to create xflow instance. Job XML:\n%s", inst_xml)
+            raise
 
     class XFlowResult(XMLRemoteModel):
         class XFlowAction(XMLRemoteModel):