deepfos 1.1.60__py3-none-any.whl → 1.1.78__py3-none-any.whl

deepfos/element/dimension.py

@@ -8,9 +8,9 @@ import pandas as pd
 from loguru import logger
 
 from deepfos.element.rolestrategy import RoleStrategy, AsyncRoleStrategy
-from pydantic import parse_obj_as, Field
 from multidict import CIMultiDict
 
+from deepfos.api.models import compat_parse_obj_as as parse_obj_as
 from .base import ElementBase, SyncMeta
 from .datatable import AsyncDataTableMySQL, get_table_class, T_AsyncDatatableClass
 from deepfos.algo.graph import DAGraph
@@ -57,20 +57,20 @@ class Strategy(CIEnum):
 
 
 class DimMember(DimensionMemberOperationSw):
-    is_active = True
-    is_modula = False
-    aggweight = 1.0
-    sharedmember = False
-    datatype = "NUMBER"
-    parent_name = ROOT
+    is_active: bool = True
+    is_modula: bool = False
+    aggweight: int = 1.0
+    sharedmember: bool = False
+    datatype: str = "NUMBER"
+    parent_name: str = ROOT
 
 
 class DimMemberV12(DimensionMemberOperationDto):
-    isActive = True
-    aggweight = 1.0
-    sharedMember = False
-    dataType = "NUMBER"
-    parentName = ROOT
+    isActive: bool = True
+    aggweight: int = 1.0
+    sharedMember: bool = False
+    dataType: str = "NUMBER"
+    parentName: str = ROOT
 
     @property
     def parent_name(self):
@@ -956,7 +956,7 @@ class AsyncDimension(ElementBase[DimensionAPI]):
 
         # -----------------------------------------------------------------------------
         # has shared member
-        df_shared: pd.DataFrame = df[df[shared_mbr_col]]
+        df_shared: pd.DataFrame = df[df[shared_mbr_col].astype(bool)]
         if self._strict:
             existed_mbrs = self._member_memo
 
@@ -989,7 +989,7 @@ class AsyncDimension(ElementBase[DimensionAPI]):
         # 在df中丢弃系统中已存在的共享节点
         df_shared_remain = df_shared[~df_shared.index.isin(dup_sharedmbrs)]
 
-        df_not_shared = df[~df[shared_mbr_col]]
+        df_not_shared = df[~df[shared_mbr_col].astype(bool)]
         existed_idx = df_not_shared[DFLT_NAME_COLUMN].isin(existed_mbrs)
         return df_not_shared.loc[existed_idx], \
             pd.concat([df_not_shared.loc[~existed_idx], df_shared_remain])
@@ -1162,12 +1162,25 @@ def _validate_df_for_dimension(df: pd.DataFrame):
             f"You have null value in dataframe. "
             f"column: [{DFLT_NAME_COLUMN}], index: {null_index}.")
 
-    if DFLT_PNAME_COLUMN not in df.columns:
-        raise ValueError(f"Missing column [{DFLT_PNAME_COLUMN}] in dataframe.")
+    col_parent_name = None
+    col_shared_member = None
+
+    if DFLT_PNAME_COLUMN in df.columns:
+        col_parent_name = DFLT_PNAME_COLUMN
+    elif DFLT_PNAME_COLUMN_V12 in df.columns:
+        col_parent_name = DFLT_PNAME_COLUMN_V12
 
     if SHAREDMEMBER in df.columns:
+        col_shared_member = SHAREDMEMBER
+    elif SHAREDMEMBERV12 in df.columns:
+        col_shared_member = SHAREDMEMBERV12
+
+    if col_parent_name is None:
+        raise ValueError(f"Missing column [{DFLT_PNAME_COLUMN}] or [{DFLT_PNAME_COLUMN_V12}] in dataframe.")
+
+    if col_shared_member is not None:
         unique_df = df.groupby(
-            [DFLT_NAME_COLUMN, DFLT_PNAME_COLUMN, SHAREDMEMBER],
+            [DFLT_NAME_COLUMN, col_parent_name, col_shared_member],
             as_index=False
         ).size()
         duplicated = unique_df[unique_df['size'] > 1]