datamule 2.0.0__py3-none-any.whl → 2.0.2__py3-none-any.whl

datamule/datamule/downloader.py

@@ -311,11 +311,11 @@ class Downloader:
                     columns=['accessionNumber'], distinct=True, page_size=25000, quiet=False,api_key=self.api_key)
 
             if filtered_accession_numbers:
-                filtered_accession_numbers = [str(int(item.replace('-',''))) for item in filtered_accession_numbers]
+                filtered_accession_numbers = [format_accession(item,'int') for item in filtered_accession_numbers]
                 filings = [filing for filing in filings if filing['accessionNumber'] in filtered_accession_numbers]
             
             if skip_accession_numbers:
-                skip_accession_numbers = [int(item.replace('-','')) for item in skip_accession_numbers]
+                skip_accession_numbers = [format(item,'int') for item in skip_accession_numbers]
                 filings = [filing for filing in filings if filing['accessionNumber'] not in skip_accession_numbers]
 
             logger.debug(f"Generating URLs for {len(filings)} filings...")
@@ -394,7 +394,7 @@ def download(submission_type=None, cik=None, filing_date=None, api_key=None, out
              skip_accession_numbers=[], max_batch_size=1024*1024*1024,accession_numbers=None):
     
     if filtered_accession_numbers:
-        filtered_accession_numbers = [int(str(x).replace('-', '')) for x in filtered_accession_numbers]
+        filtered_accession_numbers = [format_accession(x,'int') for x in filtered_accession_numbers]
     elif filtered_accession_numbers == []:
         raise ValueError("Applied filter resulted in empty accession numbers list")
     downloader = Downloader(api_key=api_key)

datamule/sheet.py

@@ -5,6 +5,8 @@ from .helper import _process_cik_and_metadata_filters, load_package_dataset
 from .sec.xbrl.downloadcompanyfacts import download_company_facts
 from .datamule.datamule_lookup import datamule_lookup
 from .datamule.datamule_mysql_rds import query_mysql_rds
+from company_fundamentals.utils import get_fundamental_mappings
+from company_fundamentals import construct_fundamentals
 # slated for deprecation?
 from .seclibrary.bq import get_information_table, get_345, get_proxy_voting_record
 
@@ -21,7 +23,25 @@ class Sheet:
     
     def get_table(self,table,cik=None,ticker=None,**kwargs):
         cik = _process_cik_and_metadata_filters(cik, ticker)
-        return query_mysql_rds(table=table,cik=cik,**kwargs)
+
+        if table == 'fundamentals':
+            fundamentals = kwargs.pop('fundamentals', None)
+            if fundamentals is None:
+                raise ValueError("fundamentals parameter required for fundamentals table")
+            
+            categories = kwargs.pop('categories',None)
+            
+            mappings = get_fundamental_mappings(fundamentals=fundamentals)
+            #print(mappings)
+            taxonomies = [item[0] for item in mappings]
+            names = [item[1] for item in mappings]
+            xbrl = query_mysql_rds(table='simple_xbrl',cik=cik,taxonomy=taxonomies,name=names,**kwargs)
+            #print(xbrl)
+
+            return construct_fundamentals(xbrl, 'taxonomy', 'name', 'period_start_date', 'period_end_date', categories=categories,fundamentals=fundamentals)
+            
+        else:
+            return query_mysql_rds(table=table,cik=cik,**kwargs)
 
     def download_xbrl(
         self, 

{datamule-2.0.0.dist-info → datamule-2.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datamule
-Version: 2.0.0
+Version: 2.0.2
 Summary: Work with SEC submissions at scale.
 Home-page: https://github.com/john-friedman/datamule-python
 Author: John Friedman

{datamule-2.0.0.dist-info → datamule-2.0.2.dist-info}/RECORD

@@ -5,13 +5,13 @@ datamule/index.py,sha256=Rrcna9FJV-Oh_K6O2IuUEIDmtay_7UZ4l4jgKCi7A7I,2079
 datamule/package_updater.py,sha256=Z9zaa_y0Z5cknpRn8oPea3gg4kquFHfpfhduKKCZ6NU,958
 datamule/portfolio.py,sha256=YViG1JgJ9SFhg8N3tOOhBI8oc6Pmi2vwnHeHmlkC_5U,12119
 datamule/portfolio_compression_utils.py,sha256=8OPYEN5zAdV1FiTxgVN3S7cTKs99Elv74bwgoIJP4QY,12654
-datamule/sheet.py,sha256=GnF9wA42iDw6purPmgshALymFssBp7gjmfjIs86CNJY,22997
+datamule/sheet.py,sha256=Ws_YRtpvewLVioarngVMe8cgG_sp11MP9_goGbRaiWE,23952
 datamule/submission.py,sha256=TkD_SVCEGjxOmHm5hjQm69j8DqQWr3YtgjTdKRWm26k,11205
 datamule/data/listed_filer_metadata.csv,sha256=dT9fQ8AC5P1-Udf_UF0ZkdXJ88jNxJb_tuhi5YYL1rc,2426827
 datamule/datamule/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 datamule/datamule/datamule_lookup.py,sha256=e8djAg-ctSyHiKk7BjbtgugZ3p8roUjzsym5z3AihUg,9468
 datamule/datamule/datamule_mysql_rds.py,sha256=Oj_xPTBKkzWsuRlb_tphjJrBW1eua1cOuxjGwJx581k,10591
-datamule/datamule/downloader.py,sha256=IbeBkvc4-xefHq37qktTxzCXh90cG8ayx80qQWehRvU,18527
+datamule/datamule/downloader.py,sha256=852aKx_40vWNrPqD_vobjNqwe8ZS85NprtdKSSSkjo0,18515
 datamule/datamule/sec_connector.py,sha256=VwOaODpHoAWy8JIky6kLR1-orW_PB61RHw7pIGRpkow,3288
 datamule/document/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 datamule/document/document.py,sha256=wr7gup139l7wJl8xiipROMo9in_44wAl27Rb__tpb84,16770
@@ -65,7 +65,7 @@ datamule/seclibrary/bq.py,sha256=C8sb_rpXTvchprrFLcbRar4Qi0XWW25tnv1YsHSS5o4,180
 datamule/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 datamule/utils/construct_submissions_data.py,sha256=NB_hvfxlRXPyt4Fgc-5qA8vJRItkLhBedCSTaxwW7Jg,5887
 datamule/utils/format_accession.py,sha256=60RtqoNqoT9zSKVb1DeOv1gncJxzPTFMNW4SNOVmC_g,476
-datamule-2.0.0.dist-info/METADATA,sha256=Gg6gAtm4lGxYuXLiqNB8VtP0pb1A922QvKRw9kgCegk,560
-datamule-2.0.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-datamule-2.0.0.dist-info/top_level.txt,sha256=iOfgmtSMFVyr7JGl_bYSTDry79JbmsG4p8zKq89ktKk,9
-datamule-2.0.0.dist-info/RECORD,,
+datamule-2.0.2.dist-info/METADATA,sha256=WlcxDW54ca01HEHCO-0s9dETivEsNtjiDgPjfgZBHcA,560
+datamule-2.0.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+datamule-2.0.2.dist-info/top_level.txt,sha256=iOfgmtSMFVyr7JGl_bYSTDry79JbmsG4p8zKq89ktKk,9
+datamule-2.0.2.dist-info/RECORD,,