dump-things-pyclient 0.2.5__py3-none-any.whl → 0.2.7__py3-none-any.whl

dump_things_pyclient/commands/dtc_plugins/post_records.py

@@ -1,18 +1,24 @@
 import json
 import logging
 import sys
+from itertools import count
 
 import rich_click as click
+from rich.console import Console
+from rich.progress import track
 
 from ...communicate import (
     HTTPError,
     curated_write_record,
     collection_write_record,
+    get_session,
 )
 
 
 logger = logging.getLogger('post-records')
 
+console = Console(file=sys.stderr)
+
 
 @click.command(short_help='Post records to an inbox or the curated area of a dump-things collection')
 @click.pass_obj
@@ -81,7 +87,7 @@ def post_records(
 ):
     token = obj
     if token is None:
-        click.echo('ERROR: no token provided', err=True)
+        console.print('[red]Error[/red]: No token provided')
         return 1
 
     if curated:
@@ -89,9 +95,17 @@ def post_records(
     else:
         write_record = collection_write_record
 
-    posted = False
-    for line in sys.stdin:
-        record = json.loads(line)
+    session = get_session()
+    for index, line in zip(count(), track(sys.stdin, console=console)):
+
+        try:
+            record = json.loads(line)
+        except Exception as e:
+            console.print(
+                f'[red]Error: reading JSON record #{index} failed[/red]: {e}',
+            )
+            continue
+
         try:
             write_record(
                 service_url=service_url,
@@ -99,17 +113,16 @@ def post_records(
                 class_name=cls,
                 record=record,
                 token=token,
+                session=session,
+            )
+        except HTTPError as e:
+            console.print(
+                f'[red]Error: writing record #{index} with pid {record["pid"]} failed[/red]: {e}: {e.response.text}',
             )
         except Exception as e:
-            click.echo(f'ERROR: {e}', err=True)
-        else:
-            posted = True
-            click.echo('.', nl=False)
-
-    if posted:
-        # echo a final newline
-        click.echo('')
-
+            console.print(
+                f'[red]Error: writing record #{index} with pid {record["pid"]} failed[/red]: {e}',
+            )
     return 0
 
 

dump_things_pyclient/commands/dtc_plugins/read_pages.py

@@ -1,16 +1,21 @@
 import json
 import logging
+import sys
 
 import rich_click as click
+from rich.console import Console
 
 from ...communicate import (
     HTTPError,
     get_paginated,
+    get_session,
 )
 
 
 logger = logging.getLogger('read-pages')
 
+console = Console(file=sys.stderr)
+
 
 @click.command(short_help='Read records from paginated dump-things endpoints')
 @click.pass_obj
@@ -106,8 +111,9 @@ def read_pages(
     token = obj
 
     if token is None:
-        click.echo(f'WARNING: no token provided', err=True)
+        console.print(f'[yellow]Warning[/yellow]: no token provided')
 
+    session = get_session()
     result = get_paginated(
         url=url,
         token=token,
@@ -121,7 +127,8 @@ def read_pages(
                 if matching is not None
                 else {}
             ),
-        }
+        },
+        session=session,
     )
 
     if stats: