DYPMS 0.2__tar.gz → 0.4__tar.gz

{dypms-0.2/src/DYPMS.egg-info → dypms-0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DYPMS
-Version: 0.2
+Version: 0.4
 Summary: 通联数据PMS系统数据SDK
 Author-email: songjiangduo <jiangduo.song@datayes.com>
 License-Expression: MIT

{dypms-0.2 → dypms-0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "DYPMS"
-version = "0.2"
+version = "0.4"
 authors = [
     { name = "songjiangduo", email = "jiangduo.song@datayes.com" }
 ]

{dypms-0.2 → dypms-0.4}/src/DYPMS/api/get_simulate_portfolio_list.py

@@ -10,8 +10,7 @@ field_mapping = {
     'reportingBenchmark': 'benchmark',             # 参考基准
     'user': 'creator',                             # 用户作为创建人
     'netValueStartDate': 'NAV_start_date',         # 净值开始日期
-    'netValueDate': 'latest_NAV_date',             # 最新净值日期
-    'navFrequency': 'NAV_update_frequency'         # 净值更新频率
+    'netValueDate': 'latest_NAV_date'              # 最新净值日期
 }
 
 
@@ -36,6 +35,7 @@ def get_simulate_portfolio_list(client,
             rows.append(row)
 
         df = pd.DataFrame(rows)
+        df = df.sort_values(by='establishment_date', ascending=False)
         return df
     except Exception as e:
         raise e

{dypms-0.2 → dypms-0.4}/src/DYPMS/api/get_simulate_portfolio_position.py

@@ -125,8 +125,17 @@ def get_simulate_portfolio_position(client,
         simulate_portfolio_id: 模拟组合代码，必传
         start_date: 开始日期
         end_date: 结束日期
-        penetrate_style: 穿透方式，枚举PenetrateType
+        penetrate_style: 穿透方式，支持PenetrateType枚举或字符串如"NO_PENETRATE"
     """
+    if isinstance(penetrate_style, PenetrateType):
+        penetrate_style_value = penetrate_style.name
+    elif isinstance(penetrate_style, str):
+        if penetrate_style not in PenetrateType._member_names_:
+            raise ValueError("不支持的穿透方式")
+        penetrate_style_value = penetrate_style
+    else:
+        penetrate_style_value = PenetrateType.NO_PENETRATE.name
+
     url = f"{client.base_url}/lib/simulate/portfolio/v1/position"
     headers = client.get_headers()
 
@@ -134,7 +143,7 @@ def get_simulate_portfolio_position(client,
         'accountCode': simulate_portfolio_id,
         'startDate': start_date,
         'endDate': end_date,
-        'penetrateWay': penetrate_style.name if penetrate_style else PenetrateType.NO_PENETRATE,
+        'penetrateWay': penetrate_style_value,
     }
 
     # 移除None值

{dypms-0.2 → dypms-0.4/src/DYPMS.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DYPMS
-Version: 0.2
+Version: 0.4
 Summary: 通联数据PMS系统数据SDK
 Author-email: songjiangduo <jiangduo.song@datayes.com>
 License-Expression: MIT