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

DYAMS/__init__.py

@@ -11,6 +11,10 @@ def get_post_investment_product_holdings(*args, **kwargs):
     return Client.get_instance().get_post_investment_product_holdings(*args, **kwargs)
 
 
+def get_post_investment_product_holdings_hierarchy(*args, **kwargs):
+    return Client.get_instance().get_post_investment_product_holdings_hierarchy(*args, **kwargs)
+
+
 def get_post_investment_product_performance_indicators(*args, **kwargs):
     return Client.get_instance().get_post_investment_product_performance_indicators(*args, **kwargs)
 

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

@@ -109,18 +109,6 @@ field_mapping = {
     'fxRate': 'valuation_exchange_rate',
     'positionTime': 'market_quotation_time',
     'holdDate': 'position_building_date',
-    'partyFullName': 'issuing_entity',
-    'yearToMaturity': 'remaining_maturity',
-    'nominalRatingInst': 'bond_rating_agency',
-    'nominalRating': 'bond_rating',
-    'margin': 'margin_requirement',
-    'city': 'city',
-    'province': 'province',
-    'instRatingYY': 'issuer_rating_(YY)',
-    'instRatingDate': 'issuer_rating_date',
-    'instRating': 'issuer_rating',
-    'nominalRatingDate': 'bond_rating_date',
-    'instRatingInst': 'issuer_rating_agency'
 }
 
 
@@ -140,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/api/get_post_investment_product_holdings_hierarchy.py

@@ -0,0 +1,21 @@
+import requests
+from .util import get_response_json_with_check
+
+
+def get_post_investment_product_holdings_hierarchy(client,
+                                                   post_investment_product_id,
+                                                   date):
+
+    url = f"{client.base_url}/lib/portfolio/v1/positionHierarchy"
+    data = {
+        'accountCode': post_investment_product_id,
+        'date': date
+    }
+    headers = client.get_headers()
+    try:
+        response = requests.post(url, headers=headers, json=data)
+        r = get_response_json_with_check(response)
+
+        return r
+    except Exception as e:
+        raise e

DYAMS/api/util.py

@@ -6,5 +6,5 @@ def get_response_json_with_check(response):
     if r.get('code') == -403:
         raise Exception("token认证失败")
     if r.get('code') != 'S00000':
-        raise Exception(r.get('message'))
+        raise Exception(r.get('msg'))
     return r

DYAMS/client.py

@@ -1,6 +1,7 @@
 from .api.heartbeat import heartbeat
 from .api.get_post_investment_product_list import get_post_investment_product_list
 from .api.get_post_investment_product_holdings import get_post_investment_product_holdings
+from .api.get_post_investment_product_holdings_hierarchy import get_post_investment_product_holdings_hierarchy
 from .api.get_post_investment_product_performance_indicators import get_post_investment_product_performance_indicators
 from .api.get_post_investment_product_net import get_post_investment_product_net
 from .api.get_post_investment_product_asset_allocation import get_post_investment_product_asset_allocation
@@ -39,6 +40,7 @@ class Client:
 
 Client.get_post_investment_product_list = get_post_investment_product_list
 Client.get_post_investment_product_holdings = get_post_investment_product_holdings
+Client.get_post_investment_product_holdings_hierarchy = get_post_investment_product_holdings_hierarchy
 Client.get_post_investment_product_performance_indicators = get_post_investment_product_performance_indicators
 Client.get_post_investment_product_net = get_post_investment_product_net
 Client.get_post_investment_product_asset_allocation = get_post_investment_product_asset_allocation

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

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

dyams-0.11.dist-info/RECORD

@@ -0,0 +1,18 @@
+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=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
+DYAMS/api/get_post_investment_product_performance_indicators.py,sha256=EDLz5xswVoBuDETEOXYeUxYu19USZH21rFpMUXaUs6s,1486
+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.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,,

{dyams-0.8.dist-info → dyams-0.11.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

dyams-0.8.dist-info/RECORD

@@ -1,17 +0,0 @@
-DYAMS/__init__.py,sha256=vS1EplSNSpQk9ecUZbKlnkgTurMmZj2exA9OOActxY4,933
-DYAMS/client.py,sha256=x-s7htAgveg8uiI8T8bRGk9xh_56admnjN61AZHUCnA,1930
-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=RWt8ci7ypHs_zyz0LwO8O__sVH63ADUWRaJYcPCJNpg,6645
-DYAMS/api/get_post_investment_product_list.py,sha256=lomv2qu04AFQivS2NvenYaLBYn53_P1hyxlBA2m0eJM,1515
-DYAMS/api/get_post_investment_product_net.py,sha256=TWrnKKTp8AGS0Mwe-Wo2t64fXGcVhoFi7ujNjvqPhRo,1103
-DYAMS/api/get_post_investment_product_performance_indicators.py,sha256=EDLz5xswVoBuDETEOXYeUxYu19USZH21rFpMUXaUs6s,1486
-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=VVoNbaPTyySwyrGJ60pdUPja2gWUyNBJBxY4l_xRSr8,305
-dyams-0.8.dist-info/licenses/LICENSE,sha256=WOCX9n2629PC9kRp-MvyMGR4DrNHG7_Q1Woo6QotwZ4,1130
-dyams-0.8.dist-info/METADATA,sha256=tVutXd6FREZ2ZFQ8gAU7XJW88PLu47A6P-xnmk7Goxo,437
-dyams-0.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dyams-0.8.dist-info/top_level.txt,sha256=7vYrzyi90ywuwd-c24CKytuWbuILmzcU7kQYCuBu7No,6
-dyams-0.8.dist-info/RECORD,,