DYAMS 0.5__tar.gz → 0.7__tar.gz

{dyams-0.5/src/DYAMS.egg-info → dyams-0.7}/PKG-INFO

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

{dyams-0.5 → dyams-0.7}/pyproject.toml

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

dyams-0.7/src/DYAMS/__init__.py

@@ -0,0 +1,27 @@
+from .client import Client
+
+__all__ = ['Client']
+
+
+def get_post_investment_product_list(*args, **kwargs):
+    return Client.get_instance().get_post_investment_product_list(*args, **kwargs)
+
+
+def get_post_investment_product_holdings(*args, **kwargs):
+    return Client.get_instance().get_post_investment_product_holdings(*args, **kwargs)
+
+
+def get_post_investment_product_performance_indicators(*args, **kwargs):
+    return Client.get_instance().get_post_investment_product_performance_indicators(*args, **kwargs)
+
+
+def get_post_investment_product_net(*args, **kwargs):
+    return Client.get_instance().get_post_investment_product_net(*args, **kwargs)
+
+
+def get_post_investment_product_asset_allocation(*args, **kwargs):
+    return Client.get_instance().get_post_investment_product_asset_allocation(*args, **kwargs)
+
+
+def get_private_asset_net(*args, **kwargs):
+    return Client.get_instance().get_private_asset_net(*args, **kwargs)

dyams-0.5/src/DYAMS/api/get_asset_allocation.py → dyams-0.7/src/DYAMS/api/get_post_investment_product_asset_allocation.py

@@ -11,16 +11,16 @@ field_mapping = {
 }
 
 
-def get_asset_allocation(client,
-                         post_investment_product_id,
-                         start_date=None,
-                         end_date=None,
-                         date=None,
-                         asset_class="交易属性",
-                         look_through=PenetrateType.NO_PENETRATE,
-                         level=1,
-                         weight_types=WeightType.TOTAL_FILTERED,
-                         asset_sceening=[]):
+def get_post_investment_product_asset_allocation(client,
+                                                 post_investment_product_id,
+                                                 start_date=None,
+                                                 end_date=None,
+                                                 date=None,
+                                                 asset_class="交易属性",
+                                                 penetrate_type=PenetrateType.NO_PENETRATE,
+                                                 level=1,
+                                                 weight_types=WeightType.TOTAL_FILTERED,
+                                                 asset_sceening=[]):
 
     if date:
         start_date = date
@@ -33,7 +33,7 @@ def get_asset_allocation(client,
         'accountCode': post_investment_product_id,
         'startDate': start_date,
         'endDate': end_date,
-        'penetrateWay': look_through.name if look_through else PenetrateType.NO_PENETRATE,
+        'penetrateWay': penetrate_type.name if penetrate_type else PenetrateType.NO_PENETRATE,
         'level': level,
         'assetCategoryName': asset_class,
         'ratioAssetType': weight_types.name if weight_types else WeightType.TOTAL_FILTERED,

dyams-0.5/src/DYAMS/api/get_portfolio_holdings.py → dyams-0.7/src/DYAMS/api/get_post_investment_product_holdings.py

@@ -124,15 +124,15 @@ field_mapping = {
 }
 
 
-def get_portfolio_holdings(client,
-                           post_investment_product_id,
-                           start_date=None,
-                           end_date=None,
-                           date=None,
-                           asset_class="交易属性",
-                           look_through=PenetrateType.NO_PENETRATE,
-                           level=1,
-                           fields=[]):
+def get_post_investment_product_holdings(client,
+                                         post_investment_product_id,
+                                         start_date=None,
+                                         end_date=None,
+                                         date=None,
+                                         asset_class="交易属性",
+                                         penetrate_type=PenetrateType.NO_PENETRATE,
+                                         level=1,
+                                         fields=[]):
 
     if date:
         start_date = date
@@ -145,7 +145,7 @@ def get_portfolio_holdings(client,
         'accountCode': post_investment_product_id,
         'startDate': start_date,
         'endDate': end_date,
-        'penetrateWay': look_through.name if look_through else PenetrateType.NO_PENETRATE,
+        'penetrateWay': penetrate_type.name if penetrate_type else PenetrateType.NO_PENETRATE,
         'level': level,
         'assetCategoryName': asset_class
     }

dyams-0.5/src/DYAMS/api/get_performance_indicators.py → dyams-0.7/src/DYAMS/api/get_post_investment_product_performance_indicators.py

@@ -25,8 +25,8 @@ field_mapping = {
 }
 
 
-def get_performance_indicators(client,
-                               post_investment_product_id):
+def get_post_investment_product_performance_indicators(client,
+                                                       post_investment_product_id):
 
     url = f"{client.base_url}/lib/portfolio/v1/perf"
     headers = client.get_headers()

dyams-0.5/src/DYAMS/api/private_net.py → dyams-0.7/src/DYAMS/api/get_private_asset_net.py

@@ -10,11 +10,11 @@ field_mapping = {
 }
 
 
-def private_net(client,
-                product_name=None,
-                product_code=None,
-                start_date=None,
-                end_date=None):
+def get_private_asset_net(client,
+                          product_name=None,
+                          product_code=None,
+                          start_date=None,
+                          end_date=None):
 
     url = f"{client.base_url}/lib/asset/v1/nav"
     headers = client.get_headers()

{dyams-0.5 → dyams-0.7}/src/DYAMS/client.py

@@ -1,25 +1,17 @@
 from .api.heartbeat import heartbeat
 from .api.get_post_investment_product_list import get_post_investment_product_list
-from .api.get_portfolio_holdings import get_portfolio_holdings
-from .api.get_performance_indicators import get_performance_indicators
+from .api.get_post_investment_product_holdings import get_post_investment_product_holdings
+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_asset_allocation import get_asset_allocation
-from .api.private_net import private_net
+from .api.get_post_investment_product_asset_allocation import get_post_investment_product_asset_allocation
+from .api.get_private_asset_net import get_private_asset_net
 
 
 class Client:
 
     _instance = None
 
-    def __new__(cls, *args, **kwargs):
-        if cls._instance is None:
-            cls._instance = super(Client, cls).__new__(cls)
-            cls._instance._initialized = False
-        return cls._instance
-
     def __init__(self, token='', env='prd'):
-        if self._initialized:
-            return
         self.token = token
         if env == 'prd':
             self.base_url = "https://gw.datayes.com/aladdin_mof"
@@ -29,8 +21,14 @@ class Client:
             self.base_url = "https://gw.datayes-stg.com/mom_aladdin_stg"
         else:
             raise ValueError("error env")
-        self._initialized = True
         heartbeat(self)
+        Client._instance = self
+
+    @staticmethod
+    def get_instance():
+        if Client._instance is None:
+            raise RuntimeError("Client未初始化，请先实例化Client")
+        return Client._instance
 
     def get_headers(self):
         return {
@@ -40,8 +38,8 @@ class Client:
 
 
 Client.get_post_investment_product_list = get_post_investment_product_list
-Client.get_portfolio_holdings = get_portfolio_holdings
-Client.get_performance_indicators = get_performance_indicators
+Client.get_post_investment_product_holdings = get_post_investment_product_holdings
+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_asset_allocation = get_asset_allocation
-Client.private_net = private_net
+Client.get_post_investment_product_asset_allocation = get_post_investment_product_asset_allocation
+Client.get_private_asset_net = get_private_asset_net

{dyams-0.5 → dyams-0.7/src/DYAMS.egg-info}/PKG-INFO

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

{dyams-0.5 → dyams-0.7}/src/DYAMS.egg-info/SOURCES.txt

@@ -9,11 +9,11 @@ src/DYAMS.egg-info/SOURCES.txt
 src/DYAMS.egg-info/dependency_links.txt
 src/DYAMS.egg-info/top_level.txt
 src/DYAMS/api/__init__.py
-src/DYAMS/api/get_asset_allocation.py
-src/DYAMS/api/get_performance_indicators.py
-src/DYAMS/api/get_portfolio_holdings.py
+src/DYAMS/api/get_post_investment_product_asset_allocation.py
+src/DYAMS/api/get_post_investment_product_holdings.py
 src/DYAMS/api/get_post_investment_product_list.py
 src/DYAMS/api/get_post_investment_product_net.py
+src/DYAMS/api/get_post_investment_product_performance_indicators.py
+src/DYAMS/api/get_private_asset_net.py
 src/DYAMS/api/heartbeat.py
-src/DYAMS/api/private_net.py
 src/DYAMS/api/util.py

dyams-0.5/src/DYAMS/__init__.py

@@ -1,3 +0,0 @@
-from .client import Client
-
-__all__ = ['Client']