feat(IBGE): continue work of AlertaDengue#192

pysus/ftp/__init__.py

@@ -4,7 +4,7 @@
 import pathlib
 from datetime import datetime
 from ftplib import FTP
-from typing import Any, Dict, List, Optional, Set, Union
+from typing import Any, Dict, List, Optional, Set, Union, Tuple
 from typing_extensions import Self
 
 import humanize
@@ -53,7 +53,7 @@ class File:
     basename: str
     path: str
     # parent: Directory # TODO: This causes too much overhead
-    __info__: Set[Union[int, str, datetime]]
+    __info__: dict
 
     def __init__(self, path: str, name: str, info: dict) -> None:
         name, extension = os.path.splitext(name)
@@ -461,7 +461,7 @@ class Database:
 
     ftp: FTP
     name: str
-    paths: List[Directory]
+    paths: Tuple[Directory, ...]
     metadata: dict
     __content__: Dict[str, Union[Directory, File]]
 

pysus/ftp/databases/ciha.py

@@ -6,7 +6,7 @@
 
 class CIHA(Database):
     name = "CIHA"
-    paths = (Directory("/dissemin/publicos/CIHA/201101_/Dados"))
+    paths = (Directory("/dissemin/publicos/CIHA/201101_/Dados"),)
     metadata = {
         "long_name": "Comunicação de Internação Hospitalar e Ambulatorial",
         "source": "http://ciha.datasus.gov.br/CIHA/index.php",

pysus/ftp/databases/cnes.py

@@ -6,7 +6,7 @@
 
 class CNES(Database):
     name = "CNES"
-    paths = Directory("/dissemin/publicos/CNES/200508_/Dados")
+    paths = (Directory("/dissemin/publicos/CNES/200508_/Dados"),)
     metadata = {
         "long_name": "Cadastro Nacional de Estabelecimentos de Saúde",
         "source": "https://cnes.datasus.gov.br/",

pysus/ftp/databases/ibge_datasus.py

@@ -53,7 +53,8 @@ def get_files(
             self,
             year: Optional[Union[str, int, list]] = None,
     ) -> List[File]:
-        files = [f for f in self.files if f.extension.upper() in [".ZIP", ".DBF"] and self.describe(f)["year"] == year]
+        files = [f for f in self.files if f.extension.upper(
+        ) in [".ZIP", ".DBF"] and self.describe(f)["year"] == year]
         # files = list(filter(
         #     lambda f: f.extension.upper() in [".ZIP"], self.files
         # ))
@@ -62,6 +63,7 @@ def get_files(
             years = (
                 [zfill_year(str(y)[-4:]) for y in to_list(year)]
             )
-            files = list(filter(lambda f: zfill_year(self.format(f)) in years, files))
+            files = list(filter(lambda f: zfill_year(
+                self.format(f)) in years, files))
 
         return files

pysus/online_data/IBGE.py

@@ -2,6 +2,7 @@
 Helper functions to download official statistics from IBGE SIDRA
 """
 
+import ssl  # Builtin
 import urllib3
 import requests
 import pandas as pd
@@ -235,8 +236,8 @@ def __init__(
             self, agregado: int, periodos: str, variavel: str = 'allxp', **kwargs
     ):
         self.url = (
-                APIBASE
-                + f'agregados/{agregado}/periodos/{periodos}/variaveis/{variavel}?'
+            APIBASE
+            + f'agregados/{agregado}/periodos/{periodos}/variaveis/{variavel}?'
         )
         self.url += '&'.join([f'{k}={v}' for k, v in kwargs.items()])
         self.JSON = None
@@ -265,8 +266,6 @@ def to_dataframe(self):
 SOLUTION: https://github.com/scrapy/scrapy/issues/5491#issuecomment-1241862323
 """
 
-import ssl  # Builtin
-
 
 class CustomHttpAdapter(requests.adapters.HTTPAdapter):
     # "Transport adapter" that allows us to use custom ssl_context.
@@ -300,5 +299,7 @@ def get_population(year, source='POPTCU'):
     :return: DataFrame with population data
     """
     ibgedatasus = IBGEDATASUS().load()
-    files = [f for f in ibgedatasus.get_files(year=year) if f.path.split('/')[-2] == source]
+    files = [
+        f for f in ibgedatasus.get_files(year=year) if f.path.split('/')[-2] == source
+    ]
     return files