pub-analyzer 0.1.2__py3-none-any.whl → 0.3.0__py3-none-any.whl

pub_analyzer/css/body.tcss

@@ -14,38 +14,51 @@ SideBar {
 
     background: $bg-secondary-color;
     color: $text-primary-color;
-    transition: width 250ms in_out_cubic;
-}
 
-.-dark-mode SideBar {
-    background: $bg-secondary-color-darken;
-    color: $text-primary-color-darken;
-}
+    Button {
+        text-align: start;
+    }
 
-SideBar.-hidden {
-    width: 0;
-}
+    #sidebar-title {
+        width: 100%;
+        content-align: left middle;
+        text-style: bold;
+        border-bottom: heavy $text-primary-color;
+    }
 
-SideBar .sidebar-options-column {
-    margin: 1;
-    padding: 1 1;
-}
+    .sidebar-options-column {
+        margin: 1;
+        padding: 1 1;
+    }
 
-SideBar #sidebar-title {
-    width: 100%;
-    content-align: left middle;
-    text-style: bold;
-    border-bottom: heavy $text-primary-color;
-}
+    .sidebar-buttons-column {
+        height: 1fr;
+
+        .sidebar-option {
+            content-align: left middle;
+            margin: 1 0;
+            width: 100%;
+        }
+    }
 
-.-dark-mode SideBar #sidebar-title {
-    border-bottom: heavy $text-primary-color-darken;
+    #module-version-label {
+        color: $text-primary-color 25%;
+        text-align: center;
+        width: 100%;
+    }
 }
 
-SideBar .sidebar-option {
-    content-align: left middle;
-    margin: 1 0;
-    width: 100%;
+.-dark-mode SideBar {
+    background: $bg-secondary-color-darken;
+    color: $text-primary-color-darken;
+
+    #sidebar-title {
+        border-bottom: heavy $text-primary-color-darken;
+    }
+
+    #module-version-label {
+        color: $text-primary-color-darken 25%;
+    }
 }
 
 /* Main Content CSS */
@@ -55,20 +68,20 @@ MainContent {
 
     padding: 2 1 0 1;
     height: 100%;
+
+    .title {
+        content-align: left middle;
+        text-style: bold;
+        border-bottom: heavy $text-primary-color;
+        width: 100%
+    }
 }
 
 .-dark-mode MainContent {
     background: $bg-main-color-darken;
     color: $text-primary-color-darken;
-}
-
-MainContent .title {
-    content-align: left middle;
-    text-style: bold;
-    border-bottom: heavy $text-primary-color;
-    width: 100%
-}
 
-.-dark-mode MainContent .title {
-    border-bottom: heavy $text-primary-color-darken;
+    .title {
+        border-bottom: heavy $text-primary-color-darken;
+    }
 }

pub_analyzer/css/buttons.tcss

@@ -9,7 +9,6 @@ Button.-primary {
     color: white;
     border-top: tall $primary-color-highlight;
     border-bottom: tall black;
-
 }
 
 Button.-primary:hover {

pub_analyzer/css/collapsible.tcss

@@ -0,0 +1,31 @@
+/* COLORS */
+$bg-main-color: white;
+$bg-secondary-color: #e5e7eb;
+$bg-secondary-color-accent: #d1d5db;
+$text-primary-color: black;
+
+$bg-main-color-darken: #1e293b;
+$bg-secondary-color-darken: #0f172a;
+$text-primary-color-darken: black;
+
+CollapsibleTitle {
+    background: transparent;
+    color: $text-primary-color;
+}
+
+CollapsibleTitle:hover {
+    background: transparent;
+    text-style: bold;
+    color: $text-primary-color;
+}
+
+CollapsibleTitle:focus {
+    background: transparent;
+    text-style: bold;
+    color: $text-primary-color;
+}
+
+Collapsible {
+    background: transparent;
+    border: none;
+}

pub_analyzer/css/main.tcss

@@ -38,3 +38,7 @@ Footer > .footer--key {
 LoadingIndicator {
     color: $primary-color-accent;
 }
+
+LoadingIndicator.-textual-loading-indicator {
+    background: transparent;
+}

pub_analyzer/css/summary.tcss

@@ -0,0 +1,75 @@
+/* COLORS */
+$bg-main-color: white;
+$bg-secondary-color: #e5e7eb;
+$bg-secondary-color-accent: #d1d5db;
+$text-primary-color: black;
+
+$bg-main-color-darken: #1e293b;
+$bg-secondary-color-darken: #0f172a;
+$text-primary-color-darken: black;
+
+SummaryWidget {
+    height: 1fr;
+    margin: 1 2;
+
+    /* Titles */
+    .block-title {
+        text-align: center;
+        width: 100%;
+        border-bottom: solid $text-primary-color;
+    }
+
+    /* Block Container */
+    .block-container {
+        padding: 1;
+        height: auto;
+    }
+
+    /* Cards */
+    .cards-container {
+        height: auto;
+        margin: 1 0 0 0 ;
+
+        layout: grid;
+        grid-size: 3 1;
+        grid-rows: 14;
+        grid-columns: 1fr;
+        grid-gutter: 1 2;
+    }
+
+    /* Info Container */
+    .info-container {
+        height: auto;
+
+        Label {
+            text-align: center;
+            width: 1fr;
+        }
+    }
+
+    /* Table */
+    .table-container {
+        height: auto;
+        margin: 1 0 0 0;
+    }
+
+    /* Filter Container */
+    .filter-collapsible {
+        margin-top: 1;
+
+        DateRangeFilter {
+            margin-top: 1;
+        }
+    }
+
+    /* Buttons */
+    .button-container {
+        align: center middle;
+        height: 5;
+    }
+}
+
+.-dark-mode SummaryWidget {
+    color: $text-primary-color-darken;
+    background: $bg-secondary-color;
+}

pub_analyzer/internal/identifier.py

@@ -1,11 +1,12 @@
 """Functions to extract OpenAlex IDs from Models."""
 
-from pub_analyzer.models.author import Author, AuthorResult, DehydratedAuthor
-from pub_analyzer.models.institution import DehydratedInstitution, Institution, InstitutionResult
+from pub_analyzer.models.author import Author, AuthorOpenAlexKey, AuthorResult, DehydratedAuthor
+from pub_analyzer.models.institution import DehydratedInstitution, Institution, InstitutionOpenAlexKey, InstitutionResult
+from pub_analyzer.models.source import DehydratedSource, Source
 from pub_analyzer.models.work import Work
 
 
-def get_author_id(author: Author | AuthorResult | DehydratedAuthor) -> str:
+def get_author_id(author: Author | AuthorResult | DehydratedAuthor) -> AuthorOpenAlexKey:
     """Extract OpenAlex ID from author Model.
 
     Args:
@@ -25,12 +26,12 @@ def get_author_id(author: Author | AuthorResult | DehydratedAuthor) -> str:
         ```
     """
     if author.id.path:
-        return author.id.path.rpartition('/')[2]
+        return author.id.path.rpartition("/")[2]
     else:
-        return ''
+        return ""
 
 
-def get_institution_id(institution: Institution | InstitutionResult | DehydratedInstitution) -> str:
+def get_institution_id(institution: Institution | InstitutionResult | DehydratedInstitution) -> InstitutionOpenAlexKey:
     """Extract OpenAlex ID from institution Model.
 
     Args:
@@ -50,9 +51,9 @@ def get_institution_id(institution: Institution | InstitutionResult | Dehydrated
         ```
     """
     if institution.id.path:
-        return institution.id.path.rpartition('/')[2]
+        return institution.id.path.rpartition("/")[2]
     else:
-        return ''
+        return ""
 
 
 def get_work_id(work: Work) -> str:
@@ -75,6 +76,31 @@ def get_work_id(work: Work) -> str:
         ```
     """
     if work.id.path:
-        return work.id.path.rpartition('/')[2]
+        return work.id.path.rpartition("/")[2]
     else:
-        return ''
+        return ""
+
+
+def get_source_id(source: DehydratedSource | Source) -> str:
+    """Extract OpenAlex ID from Source Model.
+
+    Args:
+        source: Source model instance.
+
+    Returns:
+        Source OpenAlex ID.
+
+    Example:
+        ```python
+        from pub_analyzer.internal.identifier import get_source_id
+        from pub_analyzer.models.source import Source
+
+        source = Source(id="https://openalex.org/S000000000", **kwargs)
+        print(get_source_id(source))
+        # 'S000000000'
+        ```
+    """
+    if source.id.path:
+        return source.id.path.rpartition("/")[2]
+    else:
+        return ""

pub_analyzer/internal/render.py

@@ -30,7 +30,7 @@ async def render_template_report(report: AuthorReport | InstitutionReport) -> st
 
     # Render template
     env = Environment(loader=FileSystemLoader(searchpath=templates_path), enable_async=True, trim_blocks=True, lstrip_blocks=True)
-    return await env.get_template("report.typ").render_async(report=report, version=version('pub-analyzer'))
+    return await env.get_template("report.typ").render_async(report=report, version=version("pub-analyzer"))
 
 
 async def render_report(report: AuthorReport | InstitutionReport, file_path: pathlib.Path) -> bytes: