PullRequest: 27 v0.0.2

Merge branch v0.0.2 of [email protected]:oceanbase/OBShell-SDK-Python.git into master
https://code.alipay.com/oceanbase/OBShell-SDK-Python/pull_requests/27

Signed-off-by: 阿绿 <[email protected]>


* feat: v0.0.2
* chore: revert .gitignore

Author: Junkrat77

obshell/__init__.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 from .service.client_set import ClientSet
-from .service.client_v1 import TaskExecuteFailedError, OBShellHandleError
+from .service.client_v1 import TaskExecuteFailedError, OBShellHandleError, IllegalOperatorError
 from .service.client_v1 import IllegalOperatorError, ClientV1
 
 __all__ = ('ClientSet', 'TaskExecuteFailedError',

obshell/model/__init__.py

@@ -12,3 +12,5 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+from .tenant import ZoneParam,ModifyReplicaParam

obshell/model/format.py

@@ -0,0 +1,26 @@
+# coding: utf-8
+# Copyright (c) 2024 OceanBase.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+def model_str(cls):
+    def __convert_value(value):
+        if isinstance(value, list):
+            return [__convert_value(item) for item in value]
+        elif isinstance(value, dict):
+            return {f"{key}": __convert_value(value) for key, value in value.items()}
+        else:
+            return str(value)
+    members = ", ".join(
+        f"\"{k}\":\"{__convert_value(v)}\"" for k, v in cls.__dict__.items())
+    return '{' + members.replace("'", "\"") + '}'

obshell/model/info.py

@@ -16,23 +16,11 @@
 from typing import List
 from enum import Enum
 
+from .format import model_str
 from obshell.model.version import Version
 from obshell.auth.base import AuthVersion
 
 
-def model_str(cls):
-    def __convert_value(value):
-        if isinstance(value, list):
-            return [__convert_value(item) for item in value]
-        elif isinstance(value, dict):
-            return {f"{key}": __convert_value(value) for key, value in value.items()}
-        else:
-            return str(value)
-    members = ", ".join(
-        f"\"{k}\":\"{__convert_value(v)}\"" for k, v in cls.__dict__.items())
-    return '{' + members.replace("'", "\"") + '}'
-
-
 class AgentInfo:
 
     def __init__(self,

obshell/model/ob.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from .info import model_str
+from .format import model_str
 
 
 class UpgradePkgInfo:

obshell/model/recyclebin.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from .info import model_str
+from .format import model_str
 
 
 class RecyclebinTenantInfo:

obshell/model/resource_pool.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from .info import model_str
+from .format import model_str
 from .unit import UnitConfig
 
 

obshell/model/task.py

@@ -15,7 +15,7 @@
 
 import json
 from enum import Enum
-from .info import model_str
+from .format import model_str
 
 
 class State(Enum):

obshell/model/tenant.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from .info import model_str
+from .format import model_str
 from .resource_pool import ResourcePoolWithUnit
 
 

obshell/model/unit.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from .info import model_str
+from .format import model_str
 
 
 class UnitConfig: