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

cs_models/resources/CoverPage13F/schemas.py

@@ -1,12 +1,12 @@
 from marshmallow import Schema, fields
-from ...utils.utils import Safe13FDate
+from ...utils.utils import Safe13FDate, Safe13FInteger
 
 
 class Coverpage13FSchema(Schema):
     ACCESSION_NUMBER = fields.String(required=True)
     REPORTCALENDARORQUARTER = Safe13FDate(required=True)
     ISAMENDMENT = fields.String()
-    AMENDMENTNO = fields.Integer()
+    AMENDMENTNO = Safe13FInteger(allow_none=True)
     AMENDMENTTYPE = fields.String()
     CONFDENIEDEXPIRED = fields.String()
     DATEDENIEDEXPIRED = Safe13FDate(allow_none=True)

cs_models/resources/InfoTable13F/models.py

@@ -1,12 +1,12 @@
-from sqlalchemy import Column, Integer, String, Date
+from sqlalchemy import Column, Integer, String, PrimaryKeyConstraint
 from ...database import Base
 
 
 class Infotable13FModel(Base):
     __tablename__ = '13finfotable'
 
-    ACCESSION_NUMBER = Column(String(25), primary_key=True)
-    INFOTABLE_SK = Column(Integer, primary_key=True)
+    ACCESSION_NUMBER = Column(String(25))
+    INFOTABLE_SK = Column(Integer)
     NAMEOFISSUER = Column(String(200), nullable=False)
     TITLEOFCLASS = Column(String(150), nullable=False)
     CUSIP = Column(String(9), nullable=False)
@@ -20,3 +20,7 @@ class Infotable13FModel(Base):
     VOTING_AUTH_SOLE = Column(Integer, nullable=False)
     VOTING_AUTH_SHARED = Column(Integer, nullable=False)
     VOTING_AUTH_NONE = Column(Integer, nullable=False)
+
+    __table_args__ = (
+        PrimaryKeyConstraint('ACCESSION_NUMBER', 'INFOTABLE_SK'),
+    )

cs_models/resources/InfoTable13F/schemas.py

@@ -1,19 +1,20 @@
 from marshmallow import Schema, fields
+from ...utils.utils import Safe13FInteger
 
 
 class Infotable13FSchema(Schema):
     ACCESSION_NUMBER = fields.String(required=True)
-    INFOTABLE_SK = fields.Integer(required=True)
+    INFOTABLE_SK = Safe13FInteger(required=True)
     NAMEOFISSUER = fields.String(required=True)
     TITLEOFCLASS = fields.String(required=True)
     CUSIP = fields.String(required=True)
     FIGI = fields.String()
-    VALUE = fields.Integer(required=True)
-    SSHPRNAMT = fields.Integer(required=True)
+    VALUE = Safe13FInteger(required=True)
+    SSHPRNAMT = Safe13FInteger(required=True)
     SSHPRNAMTTYPE = fields.String(required=True)
     PUTCALL = fields.String()
     INVESTMENTDISCRETION = fields.String(required=True)
     OTHERMANAGER = fields.String()
-    VOTING_AUTH_SOLE = fields.Integer(required=True)
-    VOTING_AUTH_SHARED = fields.Integer(required=True)
-    VOTING_AUTH_NONE = fields.Integer(required=True)
+    VOTING_AUTH_SOLE = Safe13FInteger(required=True)
+    VOTING_AUTH_SHARED = Safe13FInteger(required=True)
+    VOTING_AUTH_NONE = Safe13FInteger(required=True)

cs_models/resources/OtherManager13F/models.py

@@ -1,14 +1,18 @@
-from sqlalchemy import Column, Integer, String, Date
+from sqlalchemy import Column, Integer, String, PrimaryKeyConstraint
 from ...database import Base
 
 
 class Othermanager13FModel(Base):
     __tablename__ = '13fothermanager'
 
-    ACCESSION_NUMBER = Column(String(25), primary_key=True)
-    OTHERMANAGER_SK = Column(Integer, primary_key=True)
+    ACCESSION_NUMBER = Column(String(25))
+    OTHERMANAGER_SK = Column(Integer)
     CIK = Column(String(10))
     FORM13FFILENUMBER = Column(String(17))
     CRDNUMBER = Column(String(9))
     SECFILENUMBER = Column(String(17))
     NAME = Column(String(150), nullable=False)
+
+    __table_args__ = (
+        PrimaryKeyConstraint('ACCESSION_NUMBER', 'OTHERMANAGER_SK'),
+    )

cs_models/resources/OtherManager13F/schemas.py

@@ -1,9 +1,10 @@
 from marshmallow import Schema, fields
+from ...utils.utils import Safe13FInteger
 
 
 class Othermanager13FSchema(Schema):
     ACCESSION_NUMBER = fields.String(required=True)
-    OTHERMANAGER_SK = fields.Integer(required=True)
+    OTHERMANAGER_SK = Safe13FInteger(required=True)
     CIK = fields.String()
     FORM13FFILENUMBER = fields.String()
     CRDNUMBER = fields.String()

cs_models/resources/OtherManager213F/schemas.py

@@ -1,9 +1,10 @@
 from marshmallow import Schema, fields
+from ...utils.utils import Safe13FInteger
 
 
 class Othermanager213FSchema(Schema):
     ACCESSION_NUMBER = fields.String(required=True)
-    SEQUENCENUMBER = fields.Integer(required=True)
+    SEQUENCENUMBER = Safe13FInteger(required=True)
     CIK = fields.String()
     FORM13FFILENUMBER = fields.String()
     CRDNUMBER = fields.String()

cs_models/utils/utils.py

@@ -157,6 +157,19 @@ class Safe13FDate(fields.Date):
             raise ValidationError("Not a valid date.")
 
 
+class Safe13FInteger(fields.Integer):
+    def __init__(self, **kwargs):
+        super().__init__(format=format, **kwargs)
+
+    def _deserialize(self, value, attr, data, **kwargs):
+        if value in (None, ""):
+            return None
+        try:
+            return int(value)
+        except (ValueError, TypeError):
+            raise ValidationError("Not a valid integer.")
+
+
 if __name__ == '__main__':
     from doctest import testmod
     testmod()

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

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

{cs_models-0.0.770.dist-info → cs_models-0.0.771.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=tjoBVZGSTVcbgLVOrO16eufDSCr2mh0mbOcpudXdnwE,1058
+cs_models/resources/CoverPage13F/schemas.py,sha256=0rXY2BKDHNh1rSMBTE63g9WEKEJ_QVh4J5DSxCem5PU,1089
 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
@@ -403,8 +403,8 @@ cs_models/resources/IPOUnderwriter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQe
 cs_models/resources/IPOUnderwriter/models.py,sha256=1SK9xEMx_CyM49Uf6mzKdL-dx8P2KVTRb0X9bVkQpTk,805
 cs_models/resources/IPOUnderwriter/schemas.py,sha256=sSBN9Pf7YQIrGviaFyNMau4BOvGNpgkICg4EnbziQv8,401
 cs_models/resources/InfoTable13F/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cs_models/resources/InfoTable13F/models.py,sha256=R1qW8ptL81djXmi2fWebKaQdUdpbgjbQVksypz3RWXo,898
-cs_models/resources/InfoTable13F/schemas.py,sha256=t3gesGi_PtjIdpoGdccY9TftXVNKGD9NgejbQcnQaZg,759
+cs_models/resources/InfoTable13F/models.py,sha256=pRSl-EVjWy9sCf-9bjp4cx5nn76a_ygzcRoz2orjXP0,974
+cs_models/resources/InfoTable13F/schemas.py,sha256=auQ1-NfXkDB_kMrv5poKkR57mEhaZIuu1YXsN_n1P2Q,801
 cs_models/resources/InsightsQueue/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs_models/resources/InsightsQueue/models.py,sha256=s9yrfdbC_Iw9NGa9rCpgz2EdDqRDJVmw_LIXkwIoD84,976
 cs_models/resources/InsightsQueue/schemas.py,sha256=eU-uzGW1L2lwtkAwuAUKxSnCkOY4DiABpWYfofu0M1g,653
@@ -744,11 +744,11 @@ cs_models/resources/OrangeBookProductSubsidiary/__init__.py,sha256=47DEQpj8HBSa-
 cs_models/resources/OrangeBookProductSubsidiary/models.py,sha256=-vlsqjhqoQ_-DvWwA5aQ_nYIuvQPuo4CActyK2_Ybw8,808
 cs_models/resources/OrangeBookProductSubsidiary/schemas.py,sha256=w6P8rDDZEzUoFyJGibhwqQT7HvYvqlRa_-7epF7AwGY,380
 cs_models/resources/OtherManager13F/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cs_models/resources/OtherManager13F/models.py,sha256=1RHkT23FyK-cMcTFjgn4e7BAjNRLnpNDe7kF1dCICcY,465
-cs_models/resources/OtherManager13F/schemas.py,sha256=qUkG1Mc7zGQ1sLkfagcm1hm80ou-cipCdA95Is5KFoQ,356
+cs_models/resources/OtherManager13F/models.py,sha256=tVW8rcK1UNuc2e8PwDmHxzDvob9lHDhl3YFtn0EP73c,544
+cs_models/resources/OtherManager13F/schemas.py,sha256=uFfhZ_vlntCeZgTy948nlayDus5LZqPuHEtgSqcwH7Q,398
 cs_models/resources/OtherManager213F/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs_models/resources/OtherManager213F/models.py,sha256=C5W50ZsZq3ufW2bw3Iq26dDSdhdMsbgfE0V9-I3z_X0,464
-cs_models/resources/OtherManager213F/schemas.py,sha256=SbxhgjOPJwXtWgWrblf7_RTOwbOJezidZiLeIDdbbe0,356
+cs_models/resources/OtherManager213F/schemas.py,sha256=NQcdc_oENviW274zQ_buQ_VDEwEiwJnXcnqXYjQIqL0,398
 cs_models/resources/PTAB2Decision/__init__.py,sha256=ypyxd9cWlb0Ikt_vCZUxym_ZEF-rqxP5b7RKmF-RgWs,4988
 cs_models/resources/PTAB2Decision/models.py,sha256=JNc8Ub7B0c_gQW-iYho4o64Q77hetu9yr2jBDaLy2xQ,1909
 cs_models/resources/PTAB2Decision/schemas.py,sha256=UNNE2PuK2l-onqHkx0pN8AlY2sSWcueWxVunz3wr4sg,5093
@@ -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=Nxo-8VpGqppAHNqmmhSmz1NiNNvPYBFt17zlUYvL1xk,4095
+cs_models/utils/utils.py,sha256=BzCDk3u1np7DoJQqCZIJN4f80JNHvJoWO4qEFgolN-8,4474
 cs_models/utils/profiling/__init__.py,sha256=N-73vb0M92C975fxgXyBCBjCPELl8Oh21ZY_-tzDnns,569
-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,,
+cs_models-0.0.771.dist-info/METADATA,sha256=fC8-t-ZFGcfyBnNuK6SpyGeD-R06fxX0nLLS0MzNsyg,751
+cs_models-0.0.771.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+cs_models-0.0.771.dist-info/top_level.txt,sha256=M7CA8Nh5t0vRManQ9gHfphhO16uhMqIbfaxr1jPDg18,10
+cs_models-0.0.771.dist-info/RECORD,,