cs-models 0.0.768__py3-none-any.whl → 0.0.770__py3-none-any.whl

cs_models/resources/CoverPage13F/schemas.py

@@ -1,16 +1,16 @@
-from marshmallow import Schema, fields, pre_load
-from ...utils.utils import pre_load_date_date_fields
+from marshmallow import Schema, fields
+from ...utils.utils import Safe13FDate
 
 
 class Coverpage13FSchema(Schema):
     ACCESSION_NUMBER = fields.String(required=True)
-    REPORTCALENDARORQUARTER = fields.Date(required=True)
+    REPORTCALENDARORQUARTER = Safe13FDate(required=True)
     ISAMENDMENT = fields.String()
     AMENDMENTNO = fields.Integer()
     AMENDMENTTYPE = fields.String()
     CONFDENIEDEXPIRED = fields.String()
-    DATEDENIEDEXPIRED = fields.Date()
-    DATEREPORTED = fields.Date()
+    DATEDENIEDEXPIRED = Safe13FDate(allow_none=True)
+    DATEREPORTED = Safe13FDate(allow_none=True)
     REASONFORNONCONFIDENTIALITY = fields.String()
     FILINGMANAGER_NAME = fields.String(required=True)
     FILINGMANAGER_STREET1 = fields.String()
@@ -25,16 +25,3 @@ class Coverpage13FSchema(Schema):
     PROVIDEINFOFORINSTRUCTION5 = fields.String(required=True)
     ADDITIONALINFORMATION = fields.String()
 
-    @pre_load
-    def convert_string_to_datetime(self, in_data, **kwargs):
-        date_fields = [
-            'REPORTCALENDARORQUARTER',
-            'DATEDENIEDEXPIRED',
-            'DATEREPORTED'
-        ]
-        in_data = pre_load_date_date_fields(
-            in_data,
-            date_fields,
-            date_format="%d-%b-%Y",
-        )
-        return in_data

cs_models/resources/Signature13F/schemas.py

@@ -1,5 +1,5 @@
-from marshmallow import Schema, fields, pre_load
-from ...utils.utils import pre_load_date_date_fields
+from marshmallow import Schema, fields
+from ...utils.utils import Safe13FDate
 
 
 class Signature13FSchema(Schema):
@@ -10,16 +10,4 @@ class Signature13FSchema(Schema):
     SIGNATURE = fields.String(required=True)
     CITY = fields.String(required=True)
     STATEORCOUNTRY = fields.String(required=True)
-    SIGNATUREDATE = fields.Date(required=True)
-
-    @pre_load
-    def convert_string_to_datetime(self, in_data, **kwargs):
-        date_fields = [
-            'SIGNATUREDATE',
-        ]
-        in_data = pre_load_date_date_fields(
-            in_data,
-            date_fields,
-            date_format="%d-%b-%Y",
-        )
-        return in_data
+    SIGNATUREDATE = Safe13FDate(required=True)

cs_models/resources/Submission13F/schemas.py

@@ -1,23 +1,10 @@
-from marshmallow import Schema, fields, pre_load
-from ...utils.utils import pre_load_date_date_fields
+from marshmallow import Schema, fields
+from ...utils.utils import Safe13FDate
 
 
 class Submission13FSchema(Schema):
     ACCESSION_NUMBER = fields.String(required=True)
-    FILING_DATE = fields.Date(required=True)
+    FILING_DATE = Safe13FDate(required=True)
     SUBMISSIONTYPE = fields.String(required=True)
     CIK = fields.String(required=True)
-    PERIODOFREPORT = fields.Date(required=True)
-
-    @pre_load
-    def convert_string_to_datetime(self, in_data, **kwargs):
-        date_fields = [
-            'FILING_DATE',
-            'PERIODOFREPORT',
-        ]
-        in_data = pre_load_date_date_fields(
-            in_data,
-            date_fields,
-            date_format="%d-%b-%Y",
-        )
-        return in_data
+    PERIODOFREPORT = Safe13FDate(required=True)

cs_models/utils/utils.py

@@ -1,7 +1,7 @@
 import json
 import pytz
 from datetime import datetime
-from marshmallow import ValidationError
+from marshmallow import ValidationError, fields
 from sqlalchemy.sql.expression import ClauseElement
 
 
@@ -111,10 +111,6 @@ def convert_string_to_datetime(date, string_format='%Y-%m-%d'):
     return datetime.strptime(date, string_format).isoformat()
 
 
-def convert_string_to_date(date, string_format='%Y-%m-%d'):
-    return datetime.strptime(date, string_format).date()
-
-
 def convert_datetime_to_string(date):
     """
     >>> x = datetime(2017, 5, 16)
@@ -148,28 +144,17 @@ def pre_load_date_fields(in_data, date_fields, date_format='%m-%d-%Y'):
     return in_data
 
 
-def pre_load_date_date_fields(in_data, date_fields, date_format='%m-%d-%Y'):
-    """
-    Converts the date fields into date objects
+class Safe13FDate(fields.Date):
+    def __init__(self, format="%d-%b-%Y", **kwargs):
+        super().__init__(format=format, **kwargs)
 
-    Args:
-        in_data: dict
-        date_fields: list<str>
-        date_format: str
-
-    Returns: dict
-
-    """
-    for date_field in date_fields:
-        if date_field in in_data:
-            if in_data[date_field] in ['-', None]:
-                in_data[date_field] = None
-            else:
-                in_data[date_field] = convert_string_to_date(
-                    date=in_data[date_field],
-                    string_format=date_format,
-                )
-    return in_data
+    def _deserialize(self, value, attr, data, **kwargs):
+        if value in (None, ""):
+            return None
+        try:
+            return datetime.strptime(value, self.format).date()
+        except (ValueError, TypeError):
+            raise ValidationError("Not a valid date.")
 
 
 if __name__ == '__main__':

{cs_models-0.0.768.dist-info → cs_models-0.0.770.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cs-models
-Version: 0.0.768
+Version: 0.0.770
 Summary: MySQL db models
 Home-page: https://github.com/mindgram/cs-models
 Author: Shrey Verma

{cs_models-0.0.768.dist-info → cs_models-0.0.770.dist-info}/RECORD

@@ -222,7 +222,7 @@ cs_models/resources/Counsels/models.py,sha256=p8u93IonSVmPb5k0BlRv6HVW_PS9CY5xwF
 cs_models/resources/Counsels/schemas.py,sha256=zO7ItcXvtDJgJFmtYCZm4wHFBPPhmj76TUc6VRwK0qI,423
 cs_models/resources/CoverPage13F/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs_models/resources/CoverPage13F/models.py,sha256=2e9q0RMgtTXu0QonnOvLA5rJJ5xXN8RWXQjJi-AxD2w,1127
-cs_models/resources/CoverPage13F/schemas.py,sha256=DdlYBRChFIjk8_eiy-rbyQrgHgevox580eYc-mERk7k,1420
+cs_models/resources/CoverPage13F/schemas.py,sha256=tjoBVZGSTVcbgLVOrO16eufDSCr2mh0mbOcpudXdnwE,1058
 cs_models/resources/CrawlerLog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs_models/resources/CrawlerLog/models.py,sha256=neo5PRROx9GxvjQNnukwKvVMGTqnXrXhN_jG_HWwFSE,985
 cs_models/resources/CrawlerLog/schemas.py,sha256=2hqlZuM787N2ah8tb-CTGCAGBFgjsDafKApVvPYvxM8,1554
@@ -934,7 +934,7 @@ cs_models/resources/SearchLink/models.py,sha256=l1tPCSKHK7Wq1OUWFH72NYncEt6Q3bR0
 cs_models/resources/SearchLink/schemas.py,sha256=A8Y6LRgw7MHs9bihf0gZPfqp6KDm0Z8k6PJSL9WVxsc,448
 cs_models/resources/Signature13F/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs_models/resources/Signature13F/models.py,sha256=E-n7Fz1Lz7XOeD6H6Ca0TIe6ixxRXao0hWGGZJkr4m8,538
-cs_models/resources/Signature13F/schemas.py,sha256=exSowVbY0WV8ymxB6WjhI7WS_3SHcEUPqHzHypIZ5nc,780
+cs_models/resources/Signature13F/schemas.py,sha256=5I0yQ5amGPQg2yoklmtJJ4HiQe14kNpw7OCUXFmrm1o,457
 cs_models/resources/SmartGrid/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs_models/resources/SmartGrid/models.py,sha256=9weIkYbh-Y-My5vjjUP-N-ziSNV-AWww1UUltK8EIy0,1011
 cs_models/resources/SmartGrid/schemas.py,sha256=v5iG5dsEDnRp8P3UKba7uN39ZD_hqPvfLWyX1ltKKjM,665
@@ -946,7 +946,7 @@ cs_models/resources/Stream/models.py,sha256=wXb7yOjW82ZqmLhRcDhjLPk6_WJ5FGmvKpOc
 cs_models/resources/Stream/schemas.py,sha256=ZFsdEKINFGaSBUAcQQvilq5MKpYGliZseguQoc_opxk,3111
 cs_models/resources/Submission13F/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs_models/resources/Submission13F/models.py,sha256=T5Eky-8itEcZRY18Gbx3X0XLGVVZ03aVUyLtUngEf9U,411
-cs_models/resources/Submission13F/schemas.py,sha256=w3xYjl93U2pewUzY1vQt4DdpvMjffl3WVYjTUey8u6c,700
+cs_models/resources/Submission13F/schemas.py,sha256=0OKI8QdO2BGj_rNBtpQovzFEQ4OkF7Zu69XmYejJcg4,349
 cs_models/resources/Subsidiary/__init__.py,sha256=VmclFNMwdFXNcE9RKe-Dvl_V-OmomBK8YxeyegHMbIY,3357
 cs_models/resources/Subsidiary/models.py,sha256=C_DcgEhel41dNcq3YX4SI9uRmGt_MZZi10SNDpPdQmc,695
 cs_models/resources/Subsidiary/schemas.py,sha256=DcAyO5t4KWD7fR3_D_zrc5AORkMgUbGs_Z_Q-pLWwLM,1288
@@ -1265,9 +1265,9 @@ cs_models/resources_mongo/DocumentTree/__init__.py,sha256=0dRx5h5Y2cKgNH0F0FyfoY
 cs_models/resources_mongo/DocumentTree/schemas.py,sha256=gzKFDivnNKmUuLetsP6eBgrtD_JjFwIDSmBT9xtHRX4,416
 cs_models/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs_models/utils/alchemy.py,sha256=fhINGFn41owJ2DLXQKXAAtLqeZ1BRzD_qU0wPK_bsGQ,1598
-cs_models/utils/utils.py,sha256=o9fRAc3QT9zYIdUWt93rAeiVa8E0d5nmtqo6271yBpU,4407
+cs_models/utils/utils.py,sha256=Nxo-8VpGqppAHNqmmhSmz1NiNNvPYBFt17zlUYvL1xk,4095
 cs_models/utils/profiling/__init__.py,sha256=N-73vb0M92C975fxgXyBCBjCPELl8Oh21ZY_-tzDnns,569
-cs_models-0.0.768.dist-info/METADATA,sha256=oSsA45w2hcZ6K4qQgH_pcDBqTMaBT142jxvMoylzHDg,751
-cs_models-0.0.768.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-cs_models-0.0.768.dist-info/top_level.txt,sha256=M7CA8Nh5t0vRManQ9gHfphhO16uhMqIbfaxr1jPDg18,10
-cs_models-0.0.768.dist-info/RECORD,,
+cs_models-0.0.770.dist-info/METADATA,sha256=pe6Fo2pFvUbLrnANfuJF9bxcZtNw5BuOLjqm9yqxv-o,751
+cs_models-0.0.770.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+cs_models-0.0.770.dist-info/top_level.txt,sha256=M7CA8Nh5t0vRManQ9gHfphhO16uhMqIbfaxr1jPDg18,10
+cs_models-0.0.770.dist-info/RECORD,,