codosdk 1.0.7__tar.gz → 1.0.9__tar.gz

{codosdk-1.0.7 → codosdk-1.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: codosdk
-Version: 1.0.7
+Version: 1.0.9
 Summary: CODO项目的Python SDK
 Home-page: https://github.com/ss1917/codo_sdk/
 Author: shenshuo
@@ -31,5 +31,15 @@ Requires-Dist: loguru>=0.6.0
 Requires-Dist: cryptography==42.0.4
 Requires-Dist: ldap3==2.9
 Requires-Dist: pydantic>=1.10.5
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: platform
+Dynamic: requires-dist
+Dynamic: summary
 
 SDK of the operation and maintenance script logs operate

{codosdk-1.0.7 → codosdk-1.0.9}/codosdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: codosdk
-Version: 1.0.7
+Version: 1.0.9
 Summary: CODO项目的Python SDK
 Home-page: https://github.com/ss1917/codo_sdk/
 Author: shenshuo
@@ -31,5 +31,15 @@ Requires-Dist: loguru>=0.6.0
 Requires-Dist: cryptography==42.0.4
 Requires-Dist: ldap3==2.9
 Requires-Dist: pydantic>=1.10.5
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: platform
+Dynamic: requires-dist
+Dynamic: summary
 
 SDK of the operation and maintenance script logs operate

{codosdk-1.0.7 → codosdk-1.0.9}/setup.py

@@ -2,14 +2,14 @@
 # -*-coding:utf-8-*-
 """"
 author : shenshuo
-date   : 2023年3月8日
+date   : 2024年12月12日
 desc   : CODO SDK
 """
 
 import sys
 from distutils.core import setup
 
-VERSION = '1.0.7'
+VERSION = '1.0.9'
 
 if sys.version_info < (2, 7) or (3, 0) <= sys.version_info < (3, 6):
     print('This program requires at least Python 2.7 or 3.6 to run.')

codosdk-1.0.9/websdk2/apis/cmdb_apis.py

@@ -0,0 +1,47 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+Contact : 191715030@qq.com
+Author  : shenshuo
+Date    : 2018年2月5日13:37:54
+Desc    ：记录 CMDB API
+"""
+
+
+class CMDBAPIS:
+    cmdb_prefix = "/api/cmdb"
+
+    get_tag_list = dict(
+        method='GET',
+        url=f'{cmdb_prefix}/api/v2/cmdb/tag/list/',
+        params={
+            'page_number': '1',  # 分页/第几页
+            'page_size': '200',  # 分页/每页多少个
+            "tag_key": None
+        },
+        description='CMDB 获取标签key、value列表'
+    )
+
+    get_service_tree = dict(method='GET',
+                            url=f'{cmdb_prefix}/api/v2/cmdb/tree/',
+                            params={"biz_id": "0"},
+                            description='获取当前业务服务树')
+
+    get_dynamic_groups = dict(method='GET',
+                              url=f'{cmdb_prefix}/api/v2/cmdb/biz/dynamic_group/list/',
+                              params={
+                                  "biz_id": ""
+                              },
+                              description='获取当前业务下动态分组')
+
+    get_dynamic_group_details = dict(method='GET',
+                                     url=f'{cmdb_prefix}/api/v2/cmdb/biz/dynamic_group/preview/',
+                                     params={
+                                     },
+                                     description='获取动态分组详细数据')
+
+    get_tree_asset_server = dict(method='GET',
+                                 url=f'{cmdb_prefix}/api/v2/cmdb/tree/asset/server',
+                                 params={
+                                 },
+                                 description='根据业务获取资源信息')

{codosdk-1.0.7 → codosdk-1.0.9}/websdk2/client.py

@@ -10,6 +10,7 @@ Desc   : 处理API请求
 import json
 import requests
 from urllib.parse import urlencode
+from typing import Union, Optional
 import logging
 from .consts import const
 from .configs import configs
@@ -98,32 +99,63 @@ class AcsClient:
     #                                    timeout=self.request_timeout) as response:
     #             return await response.read()
 
-    def with_params_data_url(self, **kwargs):
-        # 重新组装URL
-        url = "{}{}".format(self.endpoint, kwargs['url'])
-        kwargs['url'] = url
+    # def with_params_data_url(self, **kwargs):
+    #     # 重新组装URL
+    #     url = "{}{}".format(self.endpoint, kwargs['url'])
+    #     kwargs['url'] = url
+    #
+    #     if not kwargs['method']: kwargs['method'] = 'GET'
+    #
+    #     # logging.debug(f"with_params_data_url {kwargs}")
+    #     body = kwargs.get('body', {})
+    #     req_json = kwargs.get('json')
+    #
+    #     if kwargs['method'] in ['POST', 'post', 'PATCH', 'patch', 'PUT', 'put']:
+    #         if not (body or req_json):
+    #             raise TypeError('method {},  body can not be empty'.format(kwargs['method']))
+    #         else:
+    #             if not isinstance(body, dict):
+    #                 json.loads(body)
+    #
+    #     if body and isinstance(body, dict): kwargs['body'] = json.dumps(body)
+    #
+    #     params = kwargs.get('params')
+    #     if params: kwargs['url'] = "{}?{}".format(url, urlencode(params))
+    #
+    #     if not self.headers: self.headers = kwargs.get('headers', {})
+    #
+    #     if kwargs['method'] not in ['GET', 'get']: self.headers['Content-Type'] = 'application/json'
+    #
+    #     return kwargs
 
-        if not kwargs['method']: kwargs['method'] = 'GET'
+    def with_params_data_url(self, **kwargs) -> dict:
+        endpoint = self.endpoint.strip("'").strip('"')
+        kwargs['url'] = f"{endpoint}{kwargs.get('url', '')}"
+        kwargs['method'] = kwargs.get('method', 'GET').upper()
 
-        # logging.debug(f"with_params_data_url {kwargs}")
-        body = kwargs.get('body', {})
-        req_json = kwargs.get('json')
+        body: Union[dict, str] = kwargs.get('body', {})
+        req_json: Optional[dict] = kwargs.get('json')
 
-        if kwargs['method'] in ['POST', 'post', 'PATCH', 'patch', 'PUT', 'put']:
+        if kwargs['method'] in {'POST', 'PATCH', 'PUT'}:
             if not (body or req_json):
-                raise TypeError('method {},  body can not be empty'.format(kwargs['method']))
-            else:
-                if not isinstance(body, dict):
-                    json.loads(body)
+                raise TypeError(f"Method {kwargs['method']} requires a non-empty body or JSON payload.")
+            if body and not isinstance(body, dict):
+                try:
+                    body = json.loads(body)
+                except json.JSONDecodeError as e:
+                    raise TypeError(f"Invalid JSON body: {e}")
 
-        if body and isinstance(body, dict): kwargs['body'] = json.dumps(body)
+        if body and isinstance(body, dict):
+            kwargs['body'] = json.dumps(body)
 
-        params = kwargs.get('params')
-        if params: kwargs['url'] = "{}?{}".format(url, urlencode(params))
+        params: Optional[dict] = kwargs.get('params')
+        if params:
+            kwargs['url'] = f"{kwargs['url']}?{urlencode(params)}"
 
-        if not self.headers: self.headers = kwargs.get('headers', {})
+        kwargs['headers'] = kwargs.get('headers', self.headers or {})
 
-        if kwargs['method'] not in ['GET', 'get']: self.headers['Content-Type'] = 'application/json'
+        if kwargs['method'] != 'GET':
+            kwargs['headers'].setdefault('Content-Type', 'application/json')
 
         return kwargs
 

{codosdk-1.0.7 → codosdk-1.0.9}/websdk2/model_utils.py

@@ -99,8 +99,7 @@ class CommonOptView:
 
     @staticmethod
     def del_data(data) -> dict:
-        keys_to_remove = ['_index', '_rowKey']
-        for key in keys_to_remove:
+        for key in ['_index', '_rowKey', 'update_time']:
             data.pop(key, None)
         return data
 

codosdk-1.0.7/websdk2/apis/cmdb_apis.py

@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-"""
-Contact : 191715030@qq.com
-Author  : shenshuo
-Date    : 2018年2月5日13:37:54
-Desc    ：记录API
-"""
-
-
-class CMDBAPIS:
-    cmdb_prefix = "/api/cmdb"
-    create_jobs = dict(method='GET',
-                       url=f'{cmdb_prefix}/api/v2/cmdb/tag/list/',
-                       params={
-                           'page_number': '1',  ### 分页/第几页
-                           'page_size': '200',  ### 分页/每页多少个
-                           "tag_key": None
-                       },
-                       field_help={
-                       },
-                       description='CMDB 获取标签key、value列表')