DYAMS 0.10__py3-none-any.whl → 0.11__py3-none-any.whl

DYAMS/api/get_post_investment_product_asset_allocation.py

@@ -28,15 +28,33 @@ def get_post_investment_product_asset_allocation(client,
     elif not start_date or not end_date:
         raise ValueError("start_date and end_date are required")
 
+    if isinstance(penetrate_type, PenetrateType):
+        penetrate_type_value = penetrate_type.name
+    elif isinstance(penetrate_type, str):
+        if penetrate_type not in PenetrateType._member_names_:
+            raise ValueError("不支持的穿透方式")
+        penetrate_type_value = penetrate_type
+    else:
+        penetrate_type_value = PenetrateType.NO_PENETRATE.name
+
+    if isinstance(weight_types, WeightType):
+        weight_types_value = weight_types.name
+    elif isinstance(weight_types, str):
+        if weight_types not in WeightType._member_names_:
+            raise ValueError("不支持的权重类型")
+        weight_types_value = weight_types
+    else:
+        weight_types_value = WeightType.TOTAL_FILTERED.name
+
     url = f"{client.base_url}/lib/portfolio/v1/positionDistribution"
     data = {
         'accountCode': post_investment_product_id,
         'startDate': start_date,
         'endDate': end_date,
-        'penetrateWay': penetrate_type.name if penetrate_type else PenetrateType.NO_PENETRATE,
+        'penetrateWay': penetrate_type_value,
         'level': level,
         'assetCategoryName': asset_class,
-        'ratioAssetType': weight_types.name if weight_types else WeightType.TOTAL_FILTERED,
+        'ratioAssetType': weight_types_value,
         'securityTypes': [security_type.name for security_type in asset_sceening]
     }
     headers = client.get_headers()

DYAMS/api/get_post_investment_product_holdings.py

@@ -128,12 +128,21 @@ def get_post_investment_product_holdings(client,
     elif not start_date or not end_date:
         raise ValueError("start_date and end_date are required")
 
+    if isinstance(penetrate_type, PenetrateType):
+        penetrate_type_value = penetrate_type.name
+    elif isinstance(penetrate_type, str):
+        if penetrate_type not in PenetrateType._member_names_:
+            raise ValueError("不支持的穿透方式")
+        penetrate_type_value = penetrate_type
+    else:
+        penetrate_type_value = PenetrateType.NO_PENETRATE.name
+
     url = f"{client.base_url}/lib/portfolio/v1/position"
     data = {
         'accountCode': post_investment_product_id,
         'startDate': start_date,
         'endDate': end_date,
-        'penetrateWay': penetrate_type.name if penetrate_type else PenetrateType.NO_PENETRATE,
+        'penetrateWay': penetrate_type_value,
         'level': level,
         'assetCategoryName': asset_class
     }

{dyams-0.10.dist-info → dyams-0.11.dist-info}/METADATA

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

{dyams-0.10.dist-info → dyams-0.11.dist-info}/RECORD

@@ -2,8 +2,8 @@ DYAMS/__init__.py,sha256=fXAonP2oCy8DRX9uuOtrLAQCxzPthNmxEzuaGX_Hzz0,1101
 DYAMS/client.py,sha256=ftFBaLlq7d-61ZiCA1BbOKvR3-FpycSdnMz02fequNY,2144
 DYAMS/enums.py,sha256=rW9y7n1G_eYvPyokSN5OrPAp4-raQWB-hTWH4NIFrC8,2490
 DYAMS/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-DYAMS/api/get_post_investment_product_asset_allocation.py,sha256=LbUDdQdcoE0zBS6c7rhFZqdC_qEJhg23PQsacBrmLLA,2171
-DYAMS/api/get_post_investment_product_holdings.py,sha256=-oq4DW_pTv3g9QI_-oAs3qdJYysx4kXRCJfsF6daIC0,6184
+DYAMS/api/get_post_investment_product_asset_allocation.py,sha256=CaUJFkhnuKqm6mEOCMksa4Eoj7y4cnFle8Xf613p-9s,2819
+DYAMS/api/get_post_investment_product_holdings.py,sha256=j_b2i4M5UxyBXhMkOaMsN92ol7fumUXi7Xovyk__zjY,6518
 DYAMS/api/get_post_investment_product_holdings_hierarchy.py,sha256=QL_iJ4LYOBN_wtHc-9TeqFOX9caBPlhBnOfVxwU6JCs,641
 DYAMS/api/get_post_investment_product_list.py,sha256=lomv2qu04AFQivS2NvenYaLBYn53_P1hyxlBA2m0eJM,1515
 DYAMS/api/get_post_investment_product_net.py,sha256=TWrnKKTp8AGS0Mwe-Wo2t64fXGcVhoFi7ujNjvqPhRo,1103
@@ -11,8 +11,8 @@ DYAMS/api/get_post_investment_product_performance_indicators.py,sha256=EDLz5xswV
 DYAMS/api/get_private_asset_net.py,sha256=os5BzEwpXtQr4_GFJj9-oLmVc6WqxW1IIzJAOzXYrUI,1128
 DYAMS/api/heartbeat.py,sha256=jDjiXRqee4QtGKR7nEoo4VhnlG_wvjT3aMXYizTNt1M,333
 DYAMS/api/util.py,sha256=m8e139aQZs6IwsjstAnZdCuAqTdVheQ74NixtwLTgKg,301
-dyams-0.10.dist-info/licenses/LICENSE,sha256=WOCX9n2629PC9kRp-MvyMGR4DrNHG7_Q1Woo6QotwZ4,1130
-dyams-0.10.dist-info/METADATA,sha256=0RBkWOdZLDn68Wg6N5WO13ujpK50cqdvCv9_pc_IE-Q,438
-dyams-0.10.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-dyams-0.10.dist-info/top_level.txt,sha256=7vYrzyi90ywuwd-c24CKytuWbuILmzcU7kQYCuBu7No,6
-dyams-0.10.dist-info/RECORD,,
+dyams-0.11.dist-info/licenses/LICENSE,sha256=WOCX9n2629PC9kRp-MvyMGR4DrNHG7_Q1Woo6QotwZ4,1130
+dyams-0.11.dist-info/METADATA,sha256=_LsPrkS6sRkSC0caDdlT6_AaxURpjNT50iZp3MZUl58,438
+dyams-0.11.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+dyams-0.11.dist-info/top_level.txt,sha256=7vYrzyi90ywuwd-c24CKytuWbuILmzcU7kQYCuBu7No,6
+dyams-0.11.dist-info/RECORD,,