scholarcli 1.2__tar.gz → 1.3__tar.gz

{scholarcli-1.2 → scholarcli-1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scholarcli
-Version: 1.2
+Version: 1.3
 Summary: A tool for structured literature searches across bibliographic databases
 Author-email: Daniel Bosk <dbosk@kth.se>, Ric Glassey <glassey@kth.se>
 License-Expression: MIT

{scholarcli-1.2 → scholarcli-1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "scholarcli"
-version = "1.2"
+version = "1.3"
 description = "A tool for structured literature searches across bibliographic databases"
 authors = [{ name = "Daniel Bosk", email = "dbosk@kth.se" },
            { name = "Ric Glassey", email = "glassey@kth.se" }]

{scholarcli-1.2 → scholarcli-1.3}/src/scholar/cli.py

@@ -1629,7 +1629,6 @@ def sessions_show(
     Uses a pager for interactive viewing when output is a terminal.
     """
     import sys
-    from rich.pager import Pager
     from scholar.review import load_session
 
     console = Console()
@@ -1659,73 +1658,79 @@ def sessions_show(
         }
         print(json.dumps(output, indent=2))
     else:
-        # Build rich output, use pager if TTY
-        from io import StringIO
-        from rich.console import Console as RichConsole
-
-        # Render to string first to check if pager needed
-        string_io = StringIO()
-        render_console = RichConsole(file=string_io, force_terminal=True)
-
-        render_console.print(f"[bold]Session: {session.query}[/bold]")
-        render_console.print(
-            f"[dim]Date: {session.timestamp.strftime('%Y-%m-%d %H:%M')}[/dim]"
-        )
-
-        # Show query-provider pairs if multiple, else simple providers list
-        if len(session.query_provider_pairs) > 1:
-            render_console.print("[dim]Queries by provider:[/dim]")
-            for query, provider in session.query_provider_pairs:
-                render_console.print(f"[dim]  {provider}: {query}[/dim]")
-        else:
-            render_console.print(
-                f"[dim]Providers: {', '.join(session.providers)}[/dim]"
+        # Build output using Rich markup, render directly to console
+        def print_session_details(con: Console) -> None:
+            """Print session details with Rich formatting."""
+            con.print(f"[bold]Session: {session.query}[/bold]")
+            con.print(
+                f"[dim]Date: "
+                f"{session.timestamp.strftime('%Y-%m-%d %H:%M')}[/dim]"
             )
-        render_console.print()
 
-        # Show kept papers
-        kept = session.kept_papers
-        if kept:
-            render_console.print(
-                f"[green bold]Kept ({len(kept)}):[/green bold]"
-            )
-            for d in kept:
-                tags = (
-                    f" [dim]\\[{', '.join(d.tags)}][/dim]" if d.tags else ""
+            # Always show query per provider
+            if session.query_provider_pairs:
+                con.print("[dim]Queries by provider:[/dim]")
+                for query, provider in session.query_provider_pairs:
+                    con.print(f"[dim]  {provider}: {query}[/dim]")
+            else:
+                # Fallback: show providers with session query
+                con.print("[dim]Queries by provider:[/dim]")
+                for provider in session.providers:
+                    con.print(f"[dim]  {provider}: {session.query}[/dim]")
+            con.print()
+
+            # Show kept papers
+            kept = session.kept_papers
+            if kept:
+                con.print(f"[green bold]Kept ({len(kept)}):[/green bold]")
+                for d in kept:
+                    provider = (
+                        f" [dim]({d.provider})[/dim]" if d.provider else ""
+                    )
+                    tags = (
+                        f" [dim]\\[{', '.join(d.tags)}][/dim]"
+                        if d.tags
+                        else ""
+                    )
+                    con.print(f"  • {d.paper.title}{provider}{tags}")
+                con.print()
+
+            # Show discarded papers
+            discarded = session.discarded_papers
+            if discarded:
+                con.print(
+                    f"[red bold]Discarded ({len(discarded)}):[/red bold]"
                 )
-                render_console.print(f"  • {d.paper.title}{tags}")
-            render_console.print()
-
-        # Show discarded papers
-        discarded = session.discarded_papers
-        if discarded:
-            render_console.print(
-                f"[red bold]Discarded ({len(discarded)}):[/red bold]"
-            )
-            for d in discarded:
-                tags = (
-                    f" [dim]\\[{', '.join(d.tags)}][/dim]" if d.tags else ""
+                for d in discarded:
+                    provider = (
+                        f" [dim]({d.provider})[/dim]" if d.provider else ""
+                    )
+                    tags = (
+                        f" [dim]\\[{', '.join(d.tags)}][/dim]"
+                        if d.tags
+                        else ""
+                    )
+                    con.print(f"  • {d.paper.title}{provider}{tags}")
+                con.print()
+
+            # Show pending papers
+            pending = session.pending_papers
+            if pending:
+                con.print(
+                    f"[yellow bold]Pending ({len(pending)}):[/yellow bold]"
                 )
-                render_console.print(f"  • {d.paper.title}{tags}")
-            render_console.print()
-
-        # Show pending papers
-        pending = session.pending_papers
-        if pending:
-            render_console.print(
-                f"[yellow bold]Pending ({len(pending)}):[/yellow bold]"
-            )
-            for d in pending:
-                render_console.print(f"  • {d.paper.title}")
-
-        output_text = string_io.getvalue()
+                for d in pending:
+                    provider = (
+                        f" [dim]({d.provider})[/dim]" if d.provider else ""
+                    )
+                    con.print(f"  • {d.paper.title}{provider}")
 
-        # Use pager if TTY, otherwise just print
+        # Use pager if TTY, otherwise print directly
         if sys.stdout.isatty():
             with console.pager(styles=True):
-                console.print(output_text, end="")
+                print_session_details(console)
         else:
-            print(output_text, end="")
+            print_session_details(console)
 
 
 @sessions_app.command("export")

{scholarcli-1.2 → scholarcli-1.3}/src/scholar/providers.py

@@ -511,7 +511,7 @@ class SemanticScholarProvider:
             logger.warning("s2: %s", e)
             return all_papers
 
-    def get_paper_by_doi(self, doi: str) -> Paper | None:
+    def get_paper_by_doi(self, doi: str | None) -> Paper | None:
         """
         Fetch a single paper by its DOI.
 
@@ -888,7 +888,7 @@ class OpenAlexProvider:
             logger.warning("openalex: %s", e)
             return []
 
-    def get_paper_by_doi(self, doi: str) -> Paper | None:
+    def get_paper_by_doi(self, doi: str | None) -> Paper | None:
         """
         Fetch a single paper by its DOI.
 
@@ -1897,7 +1897,9 @@ class WebOfScienceProvider:
             logger.warning("wos: search_for_citation_report failed: %s", e)
             return None
 
-    def get_paper_by_doi(self, doi: str) -> Paper | None:
+    # Accept str | None to simplify calling code - callers can pass paper.doi
+    # without checking for None first (see Semantic Scholar implementation notes).
+    def get_paper_by_doi(self, doi: str | None) -> Paper | None:
         """
         Look up a paper by its DOI and return it with WOS metadata.
 

{scholarcli-1.2 → scholarcli-1.3}/src/scholarcli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scholarcli
-Version: 1.2
+Version: 1.3
 Summary: A tool for structured literature searches across bibliographic databases
 Author-email: Daniel Bosk <dbosk@kth.se>, Ric Glassey <glassey@kth.se>
 License-Expression: MIT

{scholarcli-1.2 → scholarcli-1.3}/tests/test_providers.py

@@ -112,7 +112,7 @@ class TestDefaultProviders:
         # Re-register provider without key
         ieee_provider = IEEEXploreProvider(api_key=None)
         ieee_provider.api_key = None
-        register_provider(ieee_provider)
+        register_provider(ieee_provider)  # type: ignore[arg-type]
         defaults = get_default_providers()
         assert "ieee" not in [p.name for p in defaults]
 class TestSemanticScholarProvider:
@@ -290,6 +290,8 @@ class TestSemanticScholarGetPaperByDoi:
             paper2 = provider.get_paper_by_doi("10.1234/test")
 
             assert mock_get.call_count == 1  # Only one API call
+            assert paper1 is not None
+            assert paper2 is not None
             assert paper1.title == paper2.title
 
 
@@ -556,6 +558,8 @@ class TestOpenAlexGetPaperByDoi:
             paper2 = provider.get_paper_by_doi("10.1234/test")
 
             assert mock_works.return_value.__getitem__.call_count == 1  # Only one API call
+            assert paper1 is not None
+            assert paper2 is not None
             assert paper1.title == paper2.title
 
 
@@ -1599,8 +1603,9 @@ class TestIEEEXploreProvider:
         provider = IEEEXploreProvider(api_key="test_key")
         assert provider.is_available() is True
 
-    def test_search_returns_empty_without_api_key(self):
+    def test_search_returns_empty_without_api_key(self, monkeypatch):
         """search() returns empty list when no API key is configured."""
+        monkeypatch.delenv("IEEE_API_KEY", raising=False)
         provider = IEEEXploreProvider(api_key=None)
         results = provider.search("test")
         assert results == []
@@ -1939,7 +1944,9 @@ class TestArxivProvider:
             nonlocal call_count
             call_count += 1
             if call_count < 3:
-                raise arxiv.HTTPError("http://example.com", 500, "Internal Server Error")
+                # arxiv.HTTPError signature is (url: str, retry: int, status: int),
+                # not (url, status, message) as one might expect.
+                raise arxiv.HTTPError("http://example.com", 0, 500)
             return iter([mock_result])
 
         with patch.object(provider._client, "results", side_effect=mock_results):