1018 do namespaces

cartoframes/data/__init__.py

@@ -2,10 +2,8 @@
 
 from .dataset.dataset import Dataset
 from .dataset.registry.strategies_registry import StrategiesRegistry
-from .observatory.catalog import Catalog
 
 __all__ = [
     'Dataset',
-    'StrategiesRegistry',
-    'Catalog'
+    'StrategiesRegistry'
 ]

cartoframes/data/dataset/__init__.py

@@ -1 +0,0 @@
-from __future__ import absolute_import

cartoframes/data/dataset/registry/__init__.py

@@ -1 +0,0 @@
-from __future__ import absolute_import

cartoframes/data/observatory/__init__.py

@@ -1,12 +1,14 @@
 from __future__ import absolute_import
 
-from .catalog import Catalog
-from .category import Category
-from .country import Country
-from .dataset import CatalogDataset
-from .geography import Geography
-from .provider import Provider
-from .variable import Variable
+from .catalog.catalog import Catalog
+from .catalog.category import Category
+from .catalog.country import Country
+from .catalog.dataset import CatalogDataset
+from .catalog.geography import Geography
+from .catalog.provider import Provider
+from .catalog.variable import Variable
+from .enrichment.points_enrichment import enrich_points
+from .enrichment.polygons_enrichment import enrich_polygons
 
 __all__ = [
     'Catalog',
@@ -15,5 +17,7 @@
     'CatalogDataset',
     'Geography',
     'Provider',
-    'Variable'
+    'Variable',
+    'enrich_points',
+    'enrich_polygons'
 ]

cartoframes/data/observatory/catalog.py → cartoframes/data/observatory/catalog/catalog.py

@@ -8,7 +8,7 @@
 from .subscriptions import Subscriptions
 from .repository.constants import COUNTRY_FILTER, CATEGORY_FILTER, GEOGRAPHY_FILTER
 
-from ...auth import Credentials, defaults
+from ....auth import Credentials, defaults
 
 
 class Catalog(object):

cartoframes/data/observatory/category.py → cartoframes/data/observatory/catalog/category.py

@@ -1,12 +1,10 @@
 from __future__ import absolute_import
 
-from cartoframes.data.observatory.repository.constants import CATEGORY_FILTER
-
-from cartoframes.data.observatory.repository.geography_repo import get_geography_repo
-
 from .entity import CatalogEntity
+from .repository.constants import CATEGORY_FILTER
 from .repository.category_repo import get_category_repo
 from .repository.dataset_repo import get_dataset_repo
+from .repository.geography_repo import get_geography_repo
 
 
 class Category(CatalogEntity):

cartoframes/data/observatory/country.py → cartoframes/data/observatory/catalog/country.py

@@ -1,6 +1,5 @@
 from __future__ import absolute_import
 
-
 from .entity import CatalogEntity
 from .repository.geography_repo import get_geography_repo
 from .repository.country_repo import get_country_repo

cartoframes/data/observatory/entity.py → cartoframes/data/observatory/catalog/entity.py

@@ -5,8 +5,8 @@
 
 from carto.exceptions import CartoException
 
-from ..clients.bigquery_client import BigQueryClient
-from ...auth import Credentials, defaults
+from ...clients.bigquery_client import BigQueryClient
+from ....auth import Credentials, defaults
 
 try:
     from abc import ABC

cartoframes/data/observatory/geography.py → cartoframes/data/observatory/catalog/geography.py

@@ -1,6 +1,5 @@
 from __future__ import absolute_import
 
-
 from .entity import CatalogEntity
 from .repository.dataset_repo import get_dataset_repo
 from .repository.geography_repo import get_geography_repo

cartoframes/data/observatory/repository/category_repo.py → cartoframes/data/observatory/catalog/repository/category_repo.py

@@ -19,7 +19,7 @@ def __init__(self):
 
     @classmethod
     def _get_entity_class(cls):
-        from cartoframes.data.observatory.category import Category
+        from cartoframes.data.observatory.catalog.category import Category
         return Category
 
     def _get_rows(self, filters=None):

cartoframes/data/observatory/repository/country_repo.py → cartoframes/data/observatory/catalog/repository/country_repo.py

@@ -19,7 +19,7 @@ def __init__(self):
 
     @classmethod
     def _get_entity_class(cls):
-        from cartoframes.data.observatory.country import Country
+        from cartoframes.data.observatory.catalog.country import Country
         return Country
 
     def _get_rows(self, filters=None):

cartoframes/data/observatory/repository/dataset_repo.py → cartoframes/data/observatory/catalog/repository/dataset_repo.py

@@ -28,7 +28,7 @@ def get_all(self, filters=None, credentials=None):
 
     @classmethod
     def _get_entity_class(cls):
-        from cartoframes.data.observatory.dataset import CatalogDataset
+        from cartoframes.data.observatory.catalog.dataset import CatalogDataset
         return CatalogDataset
 
     def _get_rows(self, filters=None):

cartoframes/data/observatory/repository/entity_repo.py → cartoframes/data/observatory/catalog/repository/entity_repo.py

@@ -1,6 +1,6 @@
 from cartoframes.exceptions import DiscoveryException
-from cartoframes.data.observatory.entity import CatalogList, is_slug_value
 from .repo_client import RepoClient
+from ..entity import CatalogList, is_slug_value
 
 try:
     from abc import ABC, abstractmethod

cartoframes/data/observatory/repository/geography_repo.py → cartoframes/data/observatory/catalog/repository/geography_repo.py

@@ -1,9 +1,10 @@
 from __future__ import absolute_import
 
 import geopandas as gpd
-from cartoframes.auth import Credentials
 
 from cartoframes.data import Dataset
+from cartoframes.auth import Credentials
+
 from .constants import COUNTRY_FILTER, CATEGORY_FILTER
 from .entity_repo import EntityRepository
 
@@ -32,7 +33,7 @@ def get_all(self, filters=None, credentials=None):
 
     @classmethod
     def _get_entity_class(cls):
-        from cartoframes.data.observatory.geography import Geography
+        from cartoframes.data.observatory.catalog.geography import Geography
         return Geography
 
     def _get_rows(self, filters=None):

cartoframes/data/observatory/repository/provider_repo.py → cartoframes/data/observatory/catalog/repository/provider_repo.py

@@ -17,7 +17,7 @@ def __init__(self):
 
     @classmethod
     def _get_entity_class(cls):
-        from cartoframes.data.observatory.provider import Provider
+        from cartoframes.data.observatory.catalog.provider import Provider
         return Provider
 
     def _get_rows(self, filters=None):

cartoframes/data/observatory/repository/repo_client.py → cartoframes/data/observatory/catalog/repository/repo_client.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
-from ...clients import SQLClient
-from ....auth import Credentials
+from ....clients import SQLClient
+from .....auth import Credentials
 from ..subscriptions import get_subscription_ids
 
 

cartoframes/data/observatory/repository/variable_group_repo.py → cartoframes/data/observatory/catalog/repository/variable_group_repo.py

@@ -21,7 +21,7 @@ def __init__(self):
 
     @classmethod
     def _get_entity_class(cls):
-        from cartoframes.data.observatory.variable_group import VariableGroup
+        from cartoframes.data.observatory.catalog.variable_group import VariableGroup
         return VariableGroup
 
     def _get_rows(self, filters=None):

cartoframes/data/observatory/repository/variable_repo.py → cartoframes/data/observatory/catalog/repository/variable_repo.py

@@ -20,7 +20,7 @@ def __init__(self):
 
     @classmethod
     def _get_entity_class(cls):
-        from cartoframes.data.observatory.variable import Variable
+        from cartoframes.data.observatory.catalog.variable import Variable
         return Variable
 
     def _get_rows(self, filters=None):

cartoframes/data/enrichment/enrichment_service.py → cartoframes/data/observatory/enrichment/enrichment_service.py

@@ -3,14 +3,13 @@
 
 from collections import defaultdict
 
-from ...auth import get_default_credentials
-from ...exceptions import EnrichmentException
-from ...utils.geom_utils import (_compute_geometry_from_geom, geojson_to_wkt,
-                                 wkt_to_geojson)
-from ..clients import bigquery_client
-from ..dataset.dataset import Dataset
-from ..observatory import Variable
-from ..observatory import CatalogDataset
+from ..catalog.variable import Variable
+from ..catalog.dataset import CatalogDataset
+from ...dataset.dataset import Dataset
+from ...clients import bigquery_client
+from ....auth import get_default_credentials
+from ....exceptions import EnrichmentException
+from ....utils.geom_utils import _compute_geometry_from_geom, geojson_to_wkt, wkt_to_geojson
 
 
 _ENRICHMENT_ID = 'enrichment_id'

tests/README.md

@@ -35,7 +35,7 @@ tox -e e2e
 
 ### Linter
 
-We use `flake8` in CI because it's standard, fast and compatible with GitHub tools like Hound. However, we use also `pylint`for a deeper lint analysis with `tox -e pylint`.
+We use `flake8` in CI because it's standard, fast and compatible with GitHub tools like Hound. However, we use also `pylint`for a deeper lint analysis with `tox -e lint`.
 
 ### Testing
 

tests/unit/data/observatory/examples.py → tests/unit/data/observatory/catalog/examples.py

@@ -1,11 +1,11 @@
-from cartoframes.data.observatory.variable import Variable
-from cartoframes.data.observatory.dataset import CatalogDataset
-from cartoframes.data.observatory.category import Category
-from cartoframes.data.observatory.geography import Geography
-from cartoframes.data.observatory.country import Country
-from cartoframes.data.observatory.provider import Provider
-from cartoframes.data.observatory.variable_group import VariableGroup
-from cartoframes.data.observatory.entity import CatalogList
+from cartoframes.data.observatory.catalog.variable import Variable
+from cartoframes.data.observatory.catalog.dataset import CatalogDataset
+from cartoframes.data.observatory.catalog.category import Category
+from cartoframes.data.observatory.catalog.geography import Geography
+from cartoframes.data.observatory.catalog.country import Country
+from cartoframes.data.observatory.catalog.provider import Provider
+from cartoframes.data.observatory.catalog.variable_group import VariableGroup
+from cartoframes.data.observatory.catalog.entity import CatalogList
 
 db_country1 = {'id': 'esp'}
 db_country2 = {'id': 'usa'}

tests/unit/data/observatory/repository/test_category_repo.py → tests/unit/data/observatory/catalog/repository/test_category_repo.py

@@ -1,11 +1,10 @@
 import pytest
 
-from cartoframes.data.observatory.category import Category
-
 from cartoframes.exceptions import DiscoveryException
-from cartoframes.data.observatory.entity import CatalogList
-from cartoframes.data.observatory.repository.category_repo import CategoryRepository
-from cartoframes.data.observatory.repository.repo_client import RepoClient
+from cartoframes.data.observatory.catalog.category import Category
+from cartoframes.data.observatory.catalog.entity import CatalogList
+from cartoframes.data.observatory.catalog.repository.category_repo import CategoryRepository
+from cartoframes.data.observatory.catalog.repository.repo_client import RepoClient
 from ..examples import test_category1, test_categories, db_category1, db_category2
 
 try:

tests/unit/data/observatory/repository/test_country_repo.py → tests/unit/data/observatory/catalog/repository/test_country_repo.py

@@ -1,10 +1,10 @@
 import pytest
 
 from cartoframes.exceptions import DiscoveryException
-from cartoframes.data.observatory.entity import CatalogList
-from cartoframes.data.observatory.country import Country
-from cartoframes.data.observatory.repository.country_repo import CountryRepository
-from cartoframes.data.observatory.repository.repo_client import RepoClient
+from cartoframes.data.observatory.catalog.entity import CatalogList
+from cartoframes.data.observatory.catalog.country import Country
+from cartoframes.data.observatory.catalog.repository.country_repo import CountryRepository
+from cartoframes.data.observatory.catalog.repository.repo_client import RepoClient
 from ..examples import test_countries, test_country1, db_country1, db_country2
 
 try:

tests/unit/data/observatory/repository/test_dataset_repo.py → tests/unit/data/observatory/catalog/repository/test_dataset_repo.py

@@ -3,10 +3,10 @@
 from cartoframes.auth import Credentials
 
 from cartoframes.exceptions import DiscoveryException
-from cartoframes.data.observatory.dataset import CatalogDataset
-from cartoframes.data.observatory.entity import CatalogList
-from cartoframes.data.observatory.repository.dataset_repo import DatasetRepository
-from cartoframes.data.observatory.repository.repo_client import RepoClient
+from cartoframes.data.observatory.catalog.entity import CatalogList
+from cartoframes.data.observatory.catalog.dataset import CatalogDataset
+from cartoframes.data.observatory.catalog.repository.dataset_repo import DatasetRepository
+from cartoframes.data.observatory.catalog.repository.repo_client import RepoClient
 from ..examples import test_dataset1, test_datasets, db_dataset1, db_dataset2
 
 try:

tests/unit/data/observatory/repository/test_geography_repo.py → tests/unit/data/observatory/catalog/repository/test_geography_repo.py

@@ -2,10 +2,10 @@
 
 from cartoframes.auth import Credentials
 from cartoframes.exceptions import DiscoveryException
-from cartoframes.data.observatory.entity import CatalogList
-from cartoframes.data.observatory.geography import Geography
-from cartoframes.data.observatory.repository.geography_repo import GeographyRepository
-from cartoframes.data.observatory.repository.repo_client import RepoClient
+from cartoframes.data.observatory.catalog.entity import CatalogList
+from cartoframes.data.observatory.catalog.geography import Geography
+from cartoframes.data.observatory.catalog.repository.geography_repo import GeographyRepository
+from cartoframes.data.observatory.catalog.repository.repo_client import RepoClient
 from ..examples import test_geography1, test_geographies, db_geography1, db_geography2
 
 try:

tests/unit/data/observatory/repository/test_provider_repo.py → tests/unit/data/observatory/catalog/repository/test_provider_repo.py

@@ -1,10 +1,10 @@
 import pytest
 
 from cartoframes.exceptions import DiscoveryException
-from cartoframes.data.observatory.entity import CatalogList
-from cartoframes.data.observatory.provider import Provider
-from cartoframes.data.observatory.repository.provider_repo import ProviderRepository
-from cartoframes.data.observatory.repository.repo_client import RepoClient
+from cartoframes.data.observatory.catalog.entity import CatalogList
+from cartoframes.data.observatory.catalog.provider import Provider
+from cartoframes.data.observatory.catalog.repository.provider_repo import ProviderRepository
+from cartoframes.data.observatory.catalog.repository.repo_client import RepoClient
 from ..examples import test_provider1, test_providers, db_provider1, db_provider2
 
 try:

tests/unit/data/observatory/repository/test_repo_client.py → tests/unit/data/observatory/catalog/repository/test_repo_client.py

@@ -1,5 +1,5 @@
 from cartoframes.data.clients import SQLClient
-from cartoframes.data.observatory.repository.repo_client import RepoClient
+from cartoframes.data.observatory.catalog.repository.repo_client import RepoClient
 
 from ..examples import db_dataset1, db_dataset2
 

tests/unit/data/observatory/repository/test_variable_group_repo.py → tests/unit/data/observatory/catalog/repository/test_variable_group_repo.py

@@ -1,10 +1,10 @@
 import pytest
 
 from cartoframes.exceptions import DiscoveryException
-from cartoframes.data.observatory.entity import CatalogList
-from cartoframes.data.observatory.variable_group import VariableGroup
-from cartoframes.data.observatory.repository.variable_group_repo import VariableGroupRepository
-from cartoframes.data.observatory.repository.repo_client import RepoClient
+from cartoframes.data.observatory.catalog.entity import CatalogList
+from cartoframes.data.observatory.catalog.variable_group import VariableGroup
+from cartoframes.data.observatory.catalog.repository.variable_group_repo import VariableGroupRepository
+from cartoframes.data.observatory.catalog.repository.repo_client import RepoClient
 from ..examples import test_variable_group1, test_variables_groups, db_variable_group1, db_variable_group2
 
 try:

tests/unit/data/observatory/repository/test_variable_repo.py → tests/unit/data/observatory/catalog/repository/test_variable_repo.py

@@ -1,10 +1,10 @@
 import pytest
 
 from cartoframes.exceptions import DiscoveryException
-from cartoframes.data.observatory.entity import CatalogList
-from cartoframes.data.observatory.variable import Variable
-from cartoframes.data.observatory.repository.variable_repo import VariableRepository
-from cartoframes.data.observatory.repository.repo_client import RepoClient
+from cartoframes.data.observatory.catalog.entity import CatalogList
+from cartoframes.data.observatory.catalog.variable import Variable
+from cartoframes.data.observatory.catalog.repository.variable_repo import VariableRepository
+from cartoframes.data.observatory.catalog.repository.repo_client import RepoClient
 from ..examples import test_variable1, test_variables, db_variable1, db_variable2
 
 try:

tests/unit/data/observatory/test_catalog.py → tests/unit/data/observatory/catalog/test_catalog.py

@@ -1,13 +1,13 @@
 import pytest
 
 from cartoframes.auth import Credentials
-from cartoframes.data.observatory.dataset import CatalogDataset
-from cartoframes.data.observatory.geography import Geography
-from cartoframes.data.observatory.country import Country
-from cartoframes.data.observatory.category import Category
-from cartoframes.data.observatory.catalog import Catalog
-from cartoframes.data.observatory.subscriptions import Subscriptions
-from cartoframes.data.observatory.repository.geography_repo import GeographyRepository
+from cartoframes.data.observatory.catalog.dataset import CatalogDataset
+from cartoframes.data.observatory.catalog.geography import Geography
+from cartoframes.data.observatory.catalog.country import Country
+from cartoframes.data.observatory.catalog.category import Category
+from cartoframes.data.observatory.catalog.catalog import Catalog
+from cartoframes.data.observatory.catalog.subscriptions import Subscriptions
+from cartoframes.data.observatory.catalog.repository.geography_repo import GeographyRepository
 from .examples import test_country2, test_country1, test_category1, test_category2, test_dataset1, test_dataset2, \
     test_geographies, test_datasets, test_categories, test_countries, test_geography1, test_geography2
 

tests/unit/data/observatory/test_category.py → tests/unit/data/observatory/catalog/test_category.py

@@ -1,10 +1,10 @@
 import pandas as pd
-from cartoframes.data.observatory.repository.geography_repo import GeographyRepository
 
-from cartoframes.data.observatory.category import Category
-from cartoframes.data.observatory.repository.category_repo import CategoryRepository
-from cartoframes.data.observatory.repository.dataset_repo import DatasetRepository
-from cartoframes.data.observatory.entity import CatalogList
+from cartoframes.data.observatory.catalog.category import Category
+from cartoframes.data.observatory.catalog.repository.dataset_repo import DatasetRepository
+from cartoframes.data.observatory.catalog.repository.category_repo import CategoryRepository
+from cartoframes.data.observatory.catalog.repository.geography_repo import GeographyRepository
+from cartoframes.data.observatory.catalog.entity import CatalogList
 from .examples import test_category1, test_datasets, test_categories, db_category1, test_category2, db_category2, \
     test_geographies