deepfos 1.1.37__tar.gz → 1.1.38__tar.gz

{deepfos-1.1.37 → deepfos-1.1.38}/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.1.38] - 2024-06-21
+
+### 新增
+
+* DeepModel增加获取查询语句接口
+
+### 变更
+
+* 无
+
+### 文档
+
+* 无
+
 ## [1.1.37] - 2024-06-14
 
 ### 新增

{deepfos-1.1.37 → deepfos-1.1.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepfos
-Version: 1.1.37
+Version: 1.1.38
 Summary: Collecions of useful and handy tools for deepfos platform
 Home-page: http://py.deepfos.com
 Author: deepfos-python-team
@@ -12,3 +12,19 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Requires-Python: >=3.8.3
+Requires-Dist: pandas==1.2.0
+Requires-Dist: requests==2.25.1
+Requires-Dist: pymysql==0.9.3
+Requires-Dist: aiohttp==3.8.4
+Requires-Dist: pydantic==1.8.2
+Requires-Dist: cachetools==4.2.2
+Requires-Dist: loguru==0.5.3
+Requires-Dist: PyPika==0.48.8
+Requires-Dist: aiomysql==0.0.22
+Requires-Dist: clickhouse-driver==0.2.2
+Requires-Dist: aioredis==2.0.1
+Requires-Dist: redis==4.5.3
+Requires-Dist: deepfos-ipc~=1.2.3
+Requires-Dist: typing-extensions==4.5.0
+Requires-Dist: edgedb~=1.4.0
+Requires-Dist: asyncpg~=0.29.0

{deepfos-1.1.37 → deepfos-1.1.38}/deepfos/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-06-20T03:28:41+0000",
+ "date": "2024-07-02T02:20:30+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "7f98da1b818edb559a68f03f99464a02b1af6899",
- "version": "1.1.37"
+ "full-revisionid": "13c09c30d5637a7c35615e4e528623fe5dbdfcc2",
+ "version": "1.1.38"
 }
 '''  # END VERSION_JSON
 

{deepfos-1.1.37 → deepfos-1.1.38}/deepfos/api/deepmodel.py

@@ -98,6 +98,34 @@ class DeepQLAPI(ChildAPI):
         return {'body': {'module': module, 'query': query, 'variables': variables}}
 
 
+class PresentationAPI(ChildAPI):
+    endpoint = '/presentation-layer'
+
+    @get('ql-selector/ql-record-info')
+    def ql_record_info(self, qlType: str, recordCode: str) -> Union[QlRecordVO, Awaitable[QlRecordVO]]:
+        """获取单条记录
+
+        Args:
+            qlType: 查询类型 'deepql'|'analysisql'
+            recordCode: 查询编码
+
+        """
+        return {'param': {'qlType': qlType, 'recordCode': recordCode}}
+
+    @get('ql-selector/ql-records')
+    def ql_records(self, qlType: str = None, qlRecordType: str = None) -> Union[List[QlRecordVO], Awaitable[List[QlRecordVO]]]:
+        """获取所有的ql记录
+
+        Args:
+            qlType: 查询类型 'deepql'|'analysisql'
+            qlRecordType: 记录类型：个人PERSONAL /公共：PUBLIC
+
+        Returns:
+
+        """
+        return {'param': {'qlType': qlType, 'qlRecordType': qlRecordType}}
+
+
 class ExtraAPI(ChildAPI):
     endpoint = '/'
 
@@ -134,6 +162,10 @@ class DeepModelAPI(DynamicRootAPI, builtin=True):
     def sharding(self) -> ShardingAPI:
         return ShardingAPI(self)
 
+    @cached_property
+    def presentation(self) -> PresentationAPI:
+        return PresentationAPI(self)
+
     @cached_property
     def extra(self) -> ExtraAPI:
         return ExtraAPI(self)

{deepfos-1.1.37 → deepfos-1.1.38}/deepfos/api/models/deepmodel.py

@@ -20,7 +20,9 @@ __all__ = [
     "RuleParam",
     "SequenceInstance",
     "_IndexParam",
-    "SimpleSpaceConnectionConfig"
+    "SimpleSpaceConnectionConfig",
+    "QlGlobalVariableVO",
+    "QlRecordVO"
 ]
 
 
@@ -266,5 +268,41 @@ class SimpleSpaceConnectionConfig(BaseModel):
     updateTime: Optional[str]
 
 
+class QlGlobalVariableVO(BaseModel):
+    #: 编码
+    code: Optional[str]
+    #: 类型
+    type: Optional[str]
+    #: 值
+    value: Optional[str]
+
+
+class QlRecordVO(BaseModel):
+    #: 应用标识
+    app: Optional[str]
+    #: 空间标识
+    space: Optional[str]
+    #: 用户id
+    userId: Optional[str]
+    #: 创建时间
+    createTime: Optional[str]
+    #: 应用标识
+    globalVariables: Optional[List[QlGlobalVariableVO]]
+    #: 主键标识
+    qlRecordId: Optional[str]
+    #: QL类型：deepql|graphql|analysisql
+    qlType: Optional[str]
+    #: ql编码
+    recordCode: Optional[str]
+    #: 记录内容
+    recordContent: Optional[str]
+    #: 记录名称
+    recordName: Optional[str]
+    #: 记录类型：个人PERSONAL /公共：PUBLIC
+    recordType: Optional[str]
+    #: 变量
+    variables: Any
+
+
 ObjectParam.update_forward_refs()
 ObjectLinkParam.update_forward_refs()

{deepfos-1.1.37 → deepfos-1.1.38}/deepfos/element/dimension.py

@@ -166,12 +166,12 @@ class AsyncDimension(ElementBase[DimensionAPI]):
         strict: bool = False,
         server_name: str = None,
     ):
-        super().__init__(element_name, folder_id, path, server_name)
         self._add_memo = CIMultiDict()
         self._del_memo = CIMultiDict()
         self._upd_memo = CIMultiDict()
         self.__member_memo = None if strict else CIMultiDict()
         self._strict = strict
+        super().__init__(element_name, folder_id, path, server_name)
 
     @cached_property
     def _datatable_class(self) -> T_AsyncDatatableClass:

{deepfos-1.1.37 → deepfos-1.1.38}/deepfos.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepfos
-Version: 1.1.37
+Version: 1.1.38
 Summary: Collecions of useful and handy tools for deepfos platform
 Home-page: http://py.deepfos.com
 Author: deepfos-python-team
@@ -12,3 +12,19 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Requires-Python: >=3.8.3
+Requires-Dist: pandas==1.2.0
+Requires-Dist: requests==2.25.1
+Requires-Dist: pymysql==0.9.3
+Requires-Dist: aiohttp==3.8.4
+Requires-Dist: pydantic==1.8.2
+Requires-Dist: cachetools==4.2.2
+Requires-Dist: loguru==0.5.3
+Requires-Dist: PyPika==0.48.8
+Requires-Dist: aiomysql==0.0.22
+Requires-Dist: clickhouse-driver==0.2.2
+Requires-Dist: aioredis==2.0.1
+Requires-Dist: redis==4.5.3
+Requires-Dist: deepfos-ipc~=1.2.3
+Requires-Dist: typing-extensions==4.5.0
+Requires-Dist: edgedb~=1.4.0
+Requires-Dist: asyncpg~=0.29.0

{deepfos-1.1.37 → deepfos-1.1.38}/deepfos/element/bizmodel.py

@@ -171,10 +171,10 @@ class AsyncBusinessModel(ElementBase[BusinessModelAPI]):
         path: str = None,
         server_name: str = None,
     ):
-        super().__init__(element_name, folder_id, path, server_name)
         self.__tables: Dict[str, TableNode] = {}
         self.__logic_tables = LogicTable()
         self.__dflt_ptn_id = UNSET
+        super().__init__(element_name, folder_id, path, server_name)
 
     @cached_property
     def default_partition_id(self) -> Optional[str]:

{deepfos-1.1.37 → deepfos-1.1.38}/deepfos/element/datatable.py

@@ -593,8 +593,8 @@ class AsyncDataTableMySQL(ElementBase):
         table_name: str = None,
         server_name: str = None,
     ):
-        super().__init__(element_name, folder_id, path, server_name)
         self.__tbl_name = table_name
+        super().__init__(element_name, folder_id, path, server_name)
 
     def _safe_get_txn_conf(self) -> _TxnConfig:
         try:

{deepfos-1.1.37 → deepfos-1.1.38}/deepfos/element/finmodel.py

@@ -174,10 +174,10 @@ class AsyncFinancialCube(ElementBase[FinancialModelAPI]):
         entry_object='python',
         server_name: Optional[str] = None,
     ):
-        super().__init__(element_name, folder_id, path, server_name)
         full_name = OPTION.general.task_info.get('script_name', 'python')
         self.entry_object = entry_object.format(script_name=full_name.split('.')[-1],
                                                 full_name=full_name)
+        super().__init__(element_name, folder_id, path, server_name)
 
     @future_property(on_demand=True)
     async def meta(self) -> CubeModel:

{deepfos-1.1.37 → deepfos-1.1.38}/deepfos/element/journal.py

@@ -66,8 +66,8 @@ class AsyncJournalModel(ElementBase[JournalModelAPI]):
         path: str = None,
         server_name: str = None,
     ):
-        super().__init__(element_name, folder_id, path, server_name)
         self.__tbl_name = None
+        super().__init__(element_name, folder_id, path, server_name)
 
     @future_property
     async def config(self) -> JournalModelConfig:

{deepfos-1.1.37 → deepfos-1.1.38}/deepfos/element/pyscript.py

@@ -275,11 +275,11 @@ class PythonScript(ElementBase[PythonAPI]):
         task_name: str = None,
         should_log: bool = False
     ):
+        self.should_log = should_log
+        self.task_name = task_name
         super().__init__(
             element_name=element_name, folder_id=folder_id, path=path
         )
-        self.should_log = should_log
-        self.task_name = task_name
 
     @future_property
     async def env(self) -> Tuple[str, str, Dict]:

{deepfos-1.1.37 → deepfos-1.1.38}/deepfos/element/variable.py

@@ -182,11 +182,11 @@ class AsyncVariable(ElementBase[VariableAPI]):
         path: str = None,
         server_name: str = None,
     ):
-        super().__init__(element_name=element_name, folder_id=folder_id, path=path, server_name=server_name)
         self.__group = Group()
         self.__description = None
         self.__gv_memo = None
         self.__uv_memo = None
+        super().__init__(element_name=element_name, folder_id=folder_id, path=path, server_name=server_name)
 
     @property
     def _group(self) -> Group: