lusid-sdk 2.1.405__py3-none-any.whl → 2.1.537__py3-none-any.whl

lusid/models/valuation_point_data_query_parameters.py

@@ -18,15 +18,15 @@ import re  # noqa: F401
 import json
 
 
-from typing import Any, Dict, Optional
-from pydantic.v1 import BaseModel
+from typing import Any, Dict
+from pydantic.v1 import BaseModel, Field
 from lusid.models.date_or_diary_entry import DateOrDiaryEntry
 
 class ValuationPointDataQueryParameters(BaseModel):
     """
     The parameters used in getting the ValuationPointData.  # noqa: E501
     """
-    end: Optional[DateOrDiaryEntry] = None
+    end: DateOrDiaryEntry = Field(...)
     __properties = ["end"]
 
     class Config:

lusid/models/valuation_point_data_response.py

@@ -42,7 +42,7 @@ class ValuationPointDataResponse(BaseModel):
     previous_nav: Union[StrictFloat, StrictInt] = Field(..., alias="previousNav", description="DEPRECATED. The Net Asset Value of the Fund at the End of the last Period.")
     fund_details: FundDetails = Field(..., alias="fundDetails")
     fund_valuation_point_data: FundValuationPointData = Field(..., alias="fundValuationPointData")
-    share_class_data: Dict[str, ShareClassData] = Field(..., alias="shareClassData", description="The data for all share classes in fund. Share classes are identified by their short codes.")
+    share_class_data: conlist(ShareClassData) = Field(..., alias="shareClassData", description="The data for all share classes in fund. Share classes are identified by their short codes.")
     valuation_point_code: Optional[StrictStr] = Field(None, alias="valuationPointCode", description="The code of the valuation point.")
     previous_valuation_point_code: Optional[StrictStr] = Field(None, alias="previousValuationPointCode", description="The code of the previous valuation point.")
     links: Optional[conlist(Link)] = None
@@ -85,13 +85,13 @@ class ValuationPointDataResponse(BaseModel):
         # override the default output from pydantic by calling `to_dict()` of fund_valuation_point_data
         if self.fund_valuation_point_data:
             _dict['fundValuationPointData'] = self.fund_valuation_point_data.to_dict()
-        # override the default output from pydantic by calling `to_dict()` of each value in share_class_data (dict)
-        _field_dict = {}
+        # override the default output from pydantic by calling `to_dict()` of each item in share_class_data (list)
+        _items = []
         if self.share_class_data:
-            for _key in self.share_class_data:
-                if self.share_class_data[_key]:
-                    _field_dict[_key] = self.share_class_data[_key].to_dict()
-            _dict['shareClassData'] = _field_dict
+            for _item in self.share_class_data:
+                if _item:
+                    _items.append(_item.to_dict())
+            _dict['shareClassData'] = _items
         # override the default output from pydantic by calling `to_dict()` of each item in links (list)
         _items = []
         if self.links:
@@ -148,12 +148,7 @@ class ValuationPointDataResponse(BaseModel):
             "previous_nav": obj.get("previousNav"),
             "fund_details": FundDetails.from_dict(obj.get("fundDetails")) if obj.get("fundDetails") is not None else None,
             "fund_valuation_point_data": FundValuationPointData.from_dict(obj.get("fundValuationPointData")) if obj.get("fundValuationPointData") is not None else None,
-            "share_class_data": dict(
-                (_k, ShareClassData.from_dict(_v))
-                for _k, _v in obj.get("shareClassData").items()
-            )
-            if obj.get("shareClassData") is not None
-            else None,
+            "share_class_data": [ShareClassData.from_dict(_item) for _item in obj.get("shareClassData")] if obj.get("shareClassData") is not None else None,
             "valuation_point_code": obj.get("valuationPointCode"),
             "previous_valuation_point_code": obj.get("previousValuationPointCode"),
             "links": [Link.from_dict(_item) for _item in obj.get("links")] if obj.get("links") is not None else None

lusid/rest.py

@@ -68,6 +68,11 @@ class RESTClientObject:
 
         self.proxy = configuration.proxy
         self.proxy_headers = configuration.proxy_headers
+        self.timeout = aiohttp.ClientTimeout(
+            total=configuration.timeouts.total_timeout_ms / 1000.0 if configuration.timeouts != None and configuration.timeouts.total_timeout_ms != None else None,
+            connect=configuration.timeouts.connect_timeout_ms / 1000.0 if configuration.timeouts != None and configuration.timeouts.connect_timeout_ms != None else None,
+            sock_read=configuration.timeouts.read_timeout_ms / 1000.0 if configuration.timeouts != None and configuration.timeouts.read_timeout_ms != None else None,
+        )
 
         # https pool manager
         self.pool_manager = aiohttp.ClientSession(
@@ -80,7 +85,7 @@ class RESTClientObject:
 
     async def request(self, method, url, query_params=None, headers=None,
                       body=None, post_params=None, _preload_content=True,
-                      _request_timeout=None):
+                      _request_timeout=None, opts=None):
         """Execute request
 
         :param method: http request method
@@ -93,10 +98,9 @@ class RESTClientObject:
                             and `multipart/form-data`
         :param _preload_content: this is a non-applicable field for
                                  the AiohttpClient.
-        :param _request_timeout: timeout setting for this request. If one
-                                 number provided, it will be total request
-                                 timeout. It can also be a pair (tuple) of
-                                 (connection, read) timeouts.
+        :param _request_timeout: Timeout setting. Do not use - use the opts parameter instead
+        :param opts: Configuration options for this request
+        :type opts: ConfigurationOptions, optional
         """
         method = method.upper()
         assert method in ['GET', 'HEAD', 'DELETE', 'POST', 'PUT',
@@ -112,7 +116,44 @@ class RESTClientObject:
         # url already contains the URL query string
         # so reset query_params to empty dict
         query_params = {}
-        timeout = _request_timeout or 5 * 60
+
+        # _request_timeout param cannot be removed for backwards compatability
+        # values from opts override values from _request_timeout
+        # try to get values from opts first, then _request_timeout, then self.timeout, else set to None
+        # timeout = _request_timeout or self.timeout
+        timeout = None
+        opts_total_timeout = opts.total_timeout_ms / 1000.0 if opts and opts.total_timeout_ms != None else None
+        opts_connect_timeout = opts.connect_timeout_ms / 1000.0 if opts and opts.connect_timeout_ms != None else None
+        opts_read_timeout = opts.read_timeout_ms / 1000.0 if opts and opts.read_timeout_ms != None else None
+        if not _request_timeout:
+            timeout = aiohttp.ClientTimeout(
+                total=opts_total_timeout if opts_total_timeout != None
+                    else self.timeout.total, 
+                connect=opts_connect_timeout if opts_connect_timeout != None
+                    else self.timeout.connect,
+                sock_read=opts_read_timeout if opts_read_timeout != None
+                    else self.timeout.sock_read)
+        elif isinstance(_request_timeout, aiohttp.ClientTimeout):
+            timeout = aiohttp.ClientTimeout(
+                total=opts_total_timeout if opts_total_timeout != None
+                    else _request_timeout.total if _request_timeout.total != None
+                        else self.timeout.total, 
+                connect=opts_connect_timeout if opts_connect_timeout != None
+                    else _request_timeout.connect if _request_timeout.connect != None
+                        else self.timeout.connect,
+                sock_read=opts_read_timeout if opts_read_timeout != None
+                    else _request_timeout.sock_read if _request_timeout.sock_read != None
+                        else self.timeout.sock_read)
+        elif isinstance(_request_timeout, (int, float)):
+            timeout = aiohttp.ClientTimeout(
+                total=opts_total_timeout if opts_total_timeout != None
+                    else _request_timeout, 
+                connect=opts_connect_timeout if opts_connect_timeout != None
+                    else self.timeout.connect, 
+                sock_read=opts_read_timeout if opts_read_timeout != None
+                    else self.timeout.sock_read)
+        else:
+            raise f"unexpected type '{type(_request_timeout)}' for _request_timeout"
 
         if 'Content-Type' not in headers:
             headers['Content-Type'] = 'application/json'
@@ -186,69 +227,78 @@ class RESTClientObject:
         return r
 
     async def get_request(self, url, headers=None, query_params=None,
-                  _preload_content=True, _request_timeout=None):
+                  _preload_content=True, _request_timeout=None, opts=None):
         return (await self.request("GET", url,
                                    headers=headers,
                                    _preload_content=_preload_content,
                                    _request_timeout=_request_timeout,
-                                   query_params=query_params))
+                                   query_params=query_params,
+                                   opts=opts))
 
     async def head_request(self, url, headers=None, query_params=None,
-                   _preload_content=True, _request_timeout=None):
+                   _preload_content=True, _request_timeout=None, opts=None):
         return (await self.request("HEAD", url,
                                    headers=headers,
                                    _preload_content=_preload_content,
                                    _request_timeout=_request_timeout,
-                                   query_params=query_params))
+                                   query_params=query_params,
+                                   opts=opts))
 
     async def options_request(self, url, headers=None, query_params=None,
                       post_params=None, body=None, _preload_content=True,
-                      _request_timeout=None):
+                      _request_timeout=None, opts=None):
         return (await self.request("OPTIONS", url,
                                    headers=headers,
                                    query_params=query_params,
                                    post_params=post_params,
                                    _preload_content=_preload_content,
                                    _request_timeout=_request_timeout,
-                                   body=body))
+                                   body=body,
+                                   opts=opts))
 
     async def delete_request(self, url, headers=None, query_params=None, body=None,
-                     _preload_content=True, _request_timeout=None):
+                     _preload_content=True, _request_timeout=None, 
+                     opts=None):
         return (await self.request("DELETE", url,
                                    headers=headers,
                                    query_params=query_params,
                                    _preload_content=_preload_content,
                                    _request_timeout=_request_timeout,
-                                   body=body))
+                                   body=body,
+                                   opts=opts))
 
     async def post_request(self, url, headers=None, query_params=None,
                    post_params=None, body=None, _preload_content=True,
-                   _request_timeout=None):
+                   _request_timeout=None, opts=None):
         return (await self.request("POST", url,
                                    headers=headers,
                                    query_params=query_params,
                                    post_params=post_params,
                                    _preload_content=_preload_content,
                                    _request_timeout=_request_timeout,
-                                   body=body))
+                                   body=body,
+                                   opts=opts))
 
     async def put_request(self, url, headers=None, query_params=None, post_params=None,
-                  body=None, _preload_content=True, _request_timeout=None):
+                  body=None, _preload_content=True, _request_timeout=None, 
+                  opts=None):
         return (await self.request("PUT", url,
                                    headers=headers,
                                    query_params=query_params,
                                    post_params=post_params,
                                    _preload_content=_preload_content,
                                    _request_timeout=_request_timeout,
-                                   body=body))
+                                   body=body,
+                                   opts=opts))
 
     async def patch_request(self, url, headers=None, query_params=None,
                     post_params=None, body=None, _preload_content=True,
-                    _request_timeout=None):
+                    _request_timeout=None, opts=None):
         return (await self.request("PATCH", url,
                                    headers=headers,
                                    query_params=query_params,
                                    post_params=post_params,
                                    _preload_content=_preload_content,
                                    _request_timeout=_request_timeout,
-                                   body=body))
+                                   body=body,
+                                   opts=opts))