From 9f1bae0df6f5bb35ce4433670ef30429403c2b22 Mon Sep 17 00:00:00 2001 From: Jeff Moe Date: Sat, 7 Oct 2023 17:03:15 -0600 Subject: [PATCH] black line length 80 formatting. parquet metadata --- pyproject.toml | 4 ++-- src/gbif_cruft/__about__.py | 2 +- src/gbif_cruft/cli/__init__.py | 2 +- src/gbif_cruft/lazy_group.py | 5 ++++- src/parquet/__init__.py | 16 +++++++++++++--- src/search/__init__.py | 3 +-- 6 files changed, 22 insertions(+), 10 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index de7b3fa..0f56962 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -83,12 +83,12 @@ all = [ [tool.black] target-version = ["py311"] -line-length = 120 +line-length = 80 skip-string-normalization = true [tool.ruff] target-version = "py311" -line-length = 120 +line-length = 80 select = [ "A", "ARG", diff --git a/src/gbif_cruft/__about__.py b/src/gbif_cruft/__about__.py index c8bb6c3..f32d7ab 100644 --- a/src/gbif_cruft/__about__.py +++ b/src/gbif_cruft/__about__.py @@ -1,4 +1,4 @@ # SPDX-FileCopyrightText: 2023-present Jeff Moe # # SPDX-License-Identifier: AGPL-3.0-or-later -__version__ = "0.0.3" +__version__ = "0.0.4" diff --git a/src/gbif_cruft/cli/__init__.py b/src/gbif_cruft/cli/__init__.py index 1774c86..701f940 100644 --- a/src/gbif_cruft/cli/__init__.py +++ b/src/gbif_cruft/cli/__init__.py @@ -6,12 +6,12 @@ import click from gbif_cruft.__about__ import __version__ from gbif_cruft.lazy_group import LazyGroup + @click.version_option(version=__version__, prog_name="gbif-cruft") @click.group( cls=LazyGroup, lazy_subcommands={"search": "search.cli", "parquet": "parquet.cli"}, context_settings={"help_option_names": ["-h", "--help"]}, ) - def gbif_cruft(): pass diff --git a/src/gbif_cruft/lazy_group.py b/src/gbif_cruft/lazy_group.py index e69936d..7802c58 100644 --- a/src/gbif_cruft/lazy_group.py +++ b/src/gbif_cruft/lazy_group.py @@ -37,5 +37,8 @@ class LazyGroup(click.Group): cmd_object = getattr(mod, cmd_object_name) # check the result to make debugging easier if not isinstance(cmd_object, click.BaseCommand): - raise ValueError(f"Lazy loading of {import_path} failed by returning " "a non-command object") + raise ValueError( + f"Lazy loading of {import_path} failed by returning " + "a non-command object" + ) return cmd_object diff --git a/src/parquet/__init__.py b/src/parquet/__init__.py index 6df86dc..749c698 100644 --- a/src/parquet/__init__.py +++ b/src/parquet/__init__.py @@ -5,10 +5,20 @@ import click from gbif_cruft.__about__ import __version__ from gbif_cruft.lazy_group import LazyGroup -import pyarrow +import pyarrow.parquet as pq @click.command() -@click.argument('filename', nargs=1, default="/srv/gbif/gbif_2023-10-01/occurrence.parquet/000000", type=str) +@click.argument( + 'filename', + nargs=1, + default="/srv/gbif/gbif_2023-10-01/occurrence.parquet/000000", + type=click.File('rb'), +) def cli(filename): - print(filename) + print("Reading", filename.name) + muh = pq.read_table(filename) + # print(muh) + parquet_file = pq.ParquetFile(filename) + muhmeta = parquet_file.metadata + print(muhmeta) diff --git a/src/search/__init__.py b/src/search/__init__.py index a9f637d..08c4319 100644 --- a/src/search/__init__.py +++ b/src/search/__init__.py @@ -8,11 +8,10 @@ from gbif_cruft.lazy_group import LazyGroup from pygbif import species import json + @click.command() @click.argument('name', nargs=1, default="axolotl", type=str) - def cli(name): foo = species.name_suggest(q=name) foo = json.dumps(foo) print(foo) -