diff --git a/poetry.lock b/poetry.lock index b463fc5..4735f61 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.5 and should not be changed by hand. [[package]] name = "anyio" @@ -35,24 +35,24 @@ files = [ [[package]] name = "basedosdados" -version = "2.0.0b16" +version = "2.0.0b26" description = "Organizar e facilitar o acesso a dados brasileiros através de tabelas públicas no BigQuery." optional = false -python-versions = "<4,>=3.8.1" +python-versions = "<4,>=3.9" files = [ - {file = "basedosdados-2.0.0b16-py3-none-any.whl", hash = "sha256:4a9ce1cd1438e647bac32833c1d1faed0f1b8fe6d5947e954da30e743abf2227"}, - {file = "basedosdados-2.0.0b16.tar.gz", hash = "sha256:b7d6a0c1fc6047d7eb0f6a19e3d48b7a10cff5dc6adf263b16d230fc74bef368"}, + {file = "basedosdados-2.0.0b26-py3-none-any.whl", hash = "sha256:49356b5402ce6622750615687a442ca16517dc8f856bda264b9dfd1a8092c958"}, + {file = "basedosdados-2.0.0b26.tar.gz", hash = "sha256:ddb73added39ac0bdad0fdaecb282a6ddc904c8f1f8fbfde9e3be48d0858461b"}, ] [package.dependencies] -click = {version = ">=8.1,<9", optional = true, markers = "extra == \"all\" or extra == \"cli\""} google-api-python-client = ">=2.86,<3.0" google-cloud-bigquery = ">=3.10,<4.0" google-cloud-bigquery-connection = ">=1.12,<2.0" google-cloud-bigquery-storage = ">=2.19,<3.0" google-cloud-storage = ">=2.9,<3.0" gql = {version = ">=3.4,<4.0", optional = true, markers = "extra == \"all\" or extra == \"upload\""} -loguru = "0.7.0" +loguru = ">=0.7.0,<0.8.0" +numpy = "<2.0.0" pandas = ">=2.0,<3.0" pandas-gbq = ">=0.19,<0.20" pandavro = {version = ">=1.7,<2.0", optional = true, markers = "extra == \"all\" or extra == \"avro\""} @@ -62,9 +62,8 @@ tomlkit = ">=0.11,<0.12" tqdm = ">=4,<5" [package.extras] -all = ["click (>=8.1,<9)", "gql (>=3.4,<4.0)", "pandavro (>=1.7,<2.0)", "requests-toolbelt (>=1,<2)"] +all = ["gql (>=3.4,<4.0)", "pandavro (>=1.7,<2.0)", "requests-toolbelt (>=1,<2)"] avro = ["pandavro (>=1.7,<2.0)"] -cli = ["click (>=8.1,<9)"] upload = ["gql (>=3.4,<4.0)", "requests-toolbelt (>=1,<2)"] [[package]] @@ -188,20 +187,6 @@ files = [ {file = "charset_normalizer-3.3.2-py3-none-any.whl", hash = "sha256:3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc"}, ] -[[package]] -name = "click" -version = "8.1.7" -description = "Composable command line interface toolkit" -optional = false -python-versions = ">=3.7" -files = [ - {file = "click-8.1.7-py3-none-any.whl", hash = "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28"}, - {file = "click-8.1.7.tar.gz", hash = "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de"}, -] - -[package.dependencies] -colorama = {version = "*", markers = "platform_system == \"Windows\""} - [[package]] name = "colorama" version = "0.4.6" @@ -304,8 +289,14 @@ files = [ [package.dependencies] google-auth = ">=2.14.1,<3.0.dev0" googleapis-common-protos = ">=1.56.2,<2.0.dev0" -grpcio = {version = ">=1.33.2,<2.0dev", optional = true, markers = "extra == \"grpc\""} -grpcio-status = {version = ">=1.33.2,<2.0.dev0", optional = true, markers = "extra == \"grpc\""} +grpcio = [ + {version = ">=1.33.2,<2.0dev", optional = true, markers = "python_version < \"3.11\" and extra == \"grpc\""}, + {version = ">=1.49.1,<2.0dev", optional = true, markers = "python_version >= \"3.11\" and extra == \"grpc\""}, +] +grpcio-status = [ + {version = ">=1.33.2,<2.0.dev0", optional = true, markers = "python_version < \"3.11\" and extra == \"grpc\""}, + {version = ">=1.49.1,<2.0.dev0", optional = true, markers = "python_version >= \"3.11\" and extra == \"grpc\""}, +] proto-plus = ">=1.22.3,<2.0.0dev" protobuf = ">=3.19.5,<3.20.0 || >3.20.0,<3.20.1 || >3.20.1,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<5.0.0.dev0" requests = ">=2.18.0,<3.0.0.dev0" @@ -452,7 +443,10 @@ files = [ [package.dependencies] google-api-core = {version = ">=1.34.0,<2.0.dev0 || >=2.11.dev0,<3.0.0dev", extras = ["grpc"]} google-auth = ">=2.14.1,<3.0.0dev" -proto-plus = ">=1.22.0,<2.0.0dev" +proto-plus = [ + {version = ">=1.22.0,<2.0.0dev", markers = "python_version < \"3.11\""}, + {version = ">=1.22.2,<2.0.0dev", markers = "python_version >= \"3.11\""}, +] protobuf = ">=3.19.5,<3.20.0 || >3.20.0,<3.20.1 || >3.20.1,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<5.0.0dev" [package.extras] @@ -1009,7 +1003,11 @@ files = [ ] [package.dependencies] -numpy = {version = ">=1.22.4", markers = "python_version < \"3.11\""} +numpy = [ + {version = ">=1.22.4", markers = "python_version < \"3.11\""}, + {version = ">=1.23.2", markers = "python_version == \"3.11\""}, + {version = ">=1.26.0", markers = "python_version >= \"3.12\""}, +] python-dateutil = ">=2.8.2" pytz = ">=2020.1" tzdata = ">=2022.7" @@ -1705,5 +1703,5 @@ multidict = ">=4.0" [metadata] lock-version = "2.0" -python-versions = "~3.9" -content-hash = "fc1206cc796f698ff826b4108d5509884523c50ec5e5be75f6b6d3b0e480d488" +python-versions = ">=3.9,<4" +content-hash = "667c32df008e9b95d6f07dcb943abf536faf2c8f7b1a4cd02b4e0a0a3d2e82e3" diff --git a/pyproject.toml b/pyproject.toml index 31b2e88..1751f9d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,8 +16,8 @@ packages = [ lint = "scripts.lint:main" [tool.poetry.dependencies] -python = "~3.9" -basedosdados = {version = "2.0.0-beta.16", extras = ["all"]} +python = ">=3.9,<4" +basedosdados = {version = "2.0.0-beta.26", extras = ["all"]} pandas = "^2.2.2" numpy = "^1.26.4" requests = "^2.32.3" diff --git a/src/databasers_utils/get_architecture_table_from_api.py b/src/databasers_utils/get_architecture_table_from_api.py index 0c2fe03..c2a8ba1 100644 --- a/src/databasers_utils/get_architecture_table_from_api.py +++ b/src/databasers_utils/get_architecture_table_from_api.py @@ -61,7 +61,7 @@ def get_columns_info_from_api( query_data = backend._execute_query(query=query, variables=variables) # type: ignore - query_data = backend._simplify_graphql_response(query_data)["allColumn"] + query_data = backend._simplify_response(query_data)["allColumn"] df = pd.json_normalize(query_data, max_level=3) df.index = df.order diff --git a/src/databasers_utils/upload_columns.py b/src/databasers_utils/upload_columns.py index 98e7e20..3ecfb77 100644 --- a/src/databasers_utils/upload_columns.py +++ b/src/databasers_utils/upload_columns.py @@ -34,7 +34,7 @@ def get_directory_column_id( variables = {"column_name": directory_column_name} response = backend._execute_query(query=query, variables=variables) - response = backend._simplify_graphql_response(response)["allColumn"] + response = backend._simplify_response(response)["allColumn"] df = pd.json_normalize(response) colunas_de_diretorio = df["table.dataset.fullSlug"].str.contains( @@ -122,7 +122,7 @@ def get_column_id( }}""" data = backend._execute_query(query=query) - data = backend._simplify_graphql_response(response=data)["allColumn"] + data = backend._simplify_response(response=data)["allColumn"] if data: return data[0]["_id"] else: @@ -143,7 +143,7 @@ def get_n_columns(table_id, backend: b.Backend): }}""" data = backend._execute_query(query=query) - data = backend._simplify_graphql_response(response=data)["allTable"] + data = backend._simplify_response(response=data)["allTable"] return data[0]["columns"]["edgeCount"] @@ -165,7 +165,7 @@ def get_bqtype_dict(backend: b.Backend): data = backend._execute_query(query=query) # Simplify the GraphQL response to extract the relevant data - data = backend._simplify_graphql_response(response=data)["allBigquerytype"] + data = backend._simplify_response(response=data)["allBigquerytype"] # Create a dictionary where the 'name' part is the key and the '_id' is the value bqtype_dict = {item["name"]: item["_id"] for item in data} @@ -208,9 +208,7 @@ def get_all_columns_id(table_id: str, backend: b.Backend): }}""" data = backend._execute_query(query=query) - columns_json = backend._simplify_graphql_response(response=data)[ - "allColumn" - ] + columns_json = backend._simplify_response(response=data)["allColumn"] if data: columns_list = [col["_id"] for col in columns_json]