pyeasyphd 0.3.9__tar.gz → 0.3.10__tar.gz

{pyeasyphd-0.3.9 → pyeasyphd-0.3.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyeasyphd
-Version: 0.3.9
+Version: 0.3.10
 Summary: pyeasyphd
 License: GPL-3.0-or-later
 License-File: LICENSE

{pyeasyphd-0.3.9 → pyeasyphd-0.3.10}/pyeasyphd/scripts/__init__.py

@@ -10,11 +10,18 @@ __all__ = [
     "run_generate_j_weekly",
     "run_generate_j_monthly",
     "run_generate_j_yearly",
+    # from pybibtexer
+    "run_compare_bib_with_local",
+    "run_compare_bib_with_zotero",
+    "run_format_bib_to_save_by_entry_type",
+    "run_format_bib_to_abbr_zotero_save"
 ]
 
 from .run_article_md import run_article_md_daily_notes
 from .run_article_tex import run_article_tex_submit
 from .run_beamer_tex import run_beamer_tex_weekly_reports
+from .run_compare import run_compare_bib_with_local, run_compare_bib_with_zotero
+from .run_format import run_format_bib_to_abbr_zotero_save, run_format_bib_to_save_by_entry_type
 from .run_generate import (
     run_generate_c_yearly,
     run_generate_j_e_weekly,

{pyeasyphd-0.3.9 → pyeasyphd-0.3.10}/pyeasyphd/scripts/_base.py

@@ -7,6 +7,11 @@ def expand_path(path: str) -> str:
     return os.path.expandvars(os.path.expanduser(path))
 
 
+def expand_paths(*paths):
+    # Expand and normalize file paths
+    return [expand_path(path) for path in paths]
+
+
 def build_base_options(
     include_publisher_list: List[str],
     include_abbr_list: List[str],
@@ -27,6 +32,7 @@ def build_base_options(
     Returns:
         Dictionary containing configured options
     """
+    path_conferences_journals_json = expand_path(path_conferences_journals_json)
     return {
         "include_publisher_list": include_publisher_list,
         "include_abbr_list": include_abbr_list,
@@ -38,39 +44,6 @@ def build_base_options(
     }
 
 
-def build_options(
-    options: dict, path_spidered_bibs: str, path_spidering_bibs: str, path_conferences_journals_json: str
-):
-    # Expand and normalize file paths
-    path_spidered_bibs = expand_path(path_spidered_bibs)
-    path_spidering_bibs = expand_path(path_spidering_bibs)
-    path_conferences_journals_json = expand_path(path_conferences_journals_json)
-
-    # Configure options
-    options_ = build_base_options(
-        include_publisher_list=[],
-        include_abbr_list=[],
-        exclude_publisher_list=["arXiv"],
-        exclude_abbr_list=[],
-        path_conferences_journals_json=path_conferences_journals_json,
-    )
-    options_.update(options)
-
-    full_json_c = options_["full_json_c"]
-    full_json_j = options_["full_json_j"]
-    full_json_k = options_["full_json_k"]
-
-    return (
-        path_spidered_bibs,
-        path_spidering_bibs,
-        path_conferences_journals_json,
-        full_json_c,
-        full_json_j,
-        full_json_k,
-        options_,
-    )
-
-
 def build_search_options(
     print_on_screen: bool, search_year_list: List[str], keywords_type: str, keywords_list_list: List[List[str]]
 ) -> Dict[str, Any]:

{pyeasyphd-0.3.9 → pyeasyphd-0.3.10}/pyeasyphd/scripts/run_compare.py

@@ -1,6 +1,6 @@
 from pybibtexer.tools import compare_bibs_with_local, compare_bibs_with_zotero
 
-from ._base import build_options, expand_path
+from ._base import build_base_options, expand_paths
 
 
 def run_compare_bib_with_local(
@@ -10,17 +10,18 @@ def run_compare_bib_with_local(
     path_spidered_bibs: str,
     path_spidering_bibs: str,
     path_conferences_journals_json: str,
-):
+) -> None:
     # Expand and normalize file paths
-    path_output = expand_path(path_output)
-
-    need_compare_bib = expand_path(need_compare_bib)
-
-    path_spidered_bibs, path_spidering_bibs, _, _, _, _, options_ = (
-        build_options(options, path_spidered_bibs, path_spidering_bibs, path_conferences_journals_json)
+    need_compare_bib, path_output, path_spidered_bibs, path_spidering_bibs = expand_paths(
+        need_compare_bib, path_output, path_spidered_bibs, path_spidering_bibs
     )
+
+    # Update options
+    options_ = build_base_options([], [], ["arXiv"], [], path_conferences_journals_json)
     options_["include_early_access"] = True
+    options_.update(options)
 
+    # Compare
     compare_bibs_with_local(need_compare_bib, path_spidered_bibs, path_spidering_bibs, path_output, options_)
 
 
@@ -30,15 +31,15 @@ def run_compare_bib_with_zotero(
     zotero_bib: str,
     path_output: str,
     path_conferences_journals_json: str,
-):
+) -> None:
     # Expand and normalize file paths
-    path_output = expand_path(path_output)
-
-    zotero_bib = expand_path(zotero_bib)
-    need_compare_bib = expand_path(need_compare_bib)
-
-    _, _, _, _, _, _, options_ = (
-        build_options(options, "", "", path_conferences_journals_json)
+    need_compare_bib, zotero_bib, path_output = expand_paths(
+        need_compare_bib, zotero_bib, path_output
     )
 
+    # Update options
+    options_ = build_base_options([], [], ["arXiv"], [], path_conferences_journals_json)
+    options_.update(options)
+
+    # Compare
     compare_bibs_with_zotero(zotero_bib, need_compare_bib, path_output, options_)

{pyeasyphd-0.3.9 → pyeasyphd-0.3.10}/pyeasyphd/scripts/run_format.py

@@ -2,40 +2,36 @@ from pathlib import Path
 
 from pybibtexer.tools import format_bib_to_abbr_zotero_save_modes, format_bib_to_save_mode_by_entry_type
 
-from ._base import build_options, expand_path
+from ._base import build_base_options, expand_paths
 
 
-def run_format_single_file_to_save(
+def run_format_bib_to_save_by_entry_type(
     options: dict,
     need_format_bib: str,
     path_output: str,
     path_conferences_journals_json: str,
-):
+) -> None:
     # Expand and normalize file paths
-    path_output = expand_path(path_output)
+    need_format_bib, path_output = expand_paths(need_format_bib, path_output)
 
-    need_format_bib = expand_path(need_format_bib)
-
-    _, _, _, _, _, _, options_ = (
-        build_options(options, "", "", path_conferences_journals_json)
-    )
+    # Update options
+    options_ = build_base_options([], [], [], [], path_conferences_journals_json)
+    options_.update(options)
 
     format_bib_to_save_mode_by_entry_type(Path(need_format_bib).stem, path_output, need_format_bib, options=options_)
 
 
-def run_format_single_file_to_abbr_zotero_save(
+def run_format_bib_to_abbr_zotero_save(
     options: dict,
     need_format_bib: str,
     path_output: str,
     path_conferences_journals_json: str,
-):
+) -> None:
     # Expand and normalize file paths
-    path_output = expand_path(path_output)
-
-    need_format_bib = expand_path(need_format_bib)
+    need_format_bib, path_output = expand_paths(need_format_bib, path_output)
 
-    _, _, _, _, _, _, options_ = (
-        build_options(options, "", "", path_conferences_journals_json)
-    )
+    # Update options
+    options_ = build_base_options([], [], [], [], path_conferences_journals_json)
+    options_.update(options)
 
     format_bib_to_abbr_zotero_save_modes(need_format_bib, path_output, options=options_)

{pyeasyphd-0.3.9 → pyeasyphd-0.3.10}/pyeasyphd/scripts/run_generate.py

@@ -3,7 +3,7 @@ import os
 from pyeasyphd.tools import PaperLinksGenerator, generate_from_bibs_and_write
 from pyeasyphd.utils.utils import is_last_week_of_month
 
-from ._base import build_options, expand_path
+from ._base import build_base_options, expand_paths
 
 
 def run_generate_j_weekly(
@@ -14,11 +14,11 @@ def run_generate_j_weekly(
     path_conferences_journals_json: str,
 ):
     # Expand and normalize file paths
-    path_weekly_docs = expand_path(path_weekly_docs)
+    path_weekly_docs, path_spidering_bibs = expand_paths(path_weekly_docs, path_spidering_bibs)
 
-    _, path_spidering_bibs, path_conferences_journals_json, full_json_c, full_json_j, full_json_k, options_ = (
-        build_options(options, "", path_spidering_bibs, path_conferences_journals_json)
-    )
+    # Update options
+    options_ = build_base_options([], [], ["arXiv"], [], path_conferences_journals_json)
+    options_.update(options)
 
     # Generate md and html files
     for gc in ["generate_data", "combine_data"]:
@@ -33,6 +33,11 @@ def run_generate_j_weekly(
 
     # Generate links
     for keywords_category_name in keywords_category_names:
+        full_json_c, full_json_j, full_json_k = (
+            options_["full_json_c"],
+            options_["full_json_j"],
+            options_["full_json_k"],
+        )
         output_basename = os.path.join("data", "Weekly")
         generator = PaperLinksGenerator(full_json_c, full_json_j, full_json_k, path_weekly_docs, keywords_category_name)
         generator.generate_weekly_links(output_basename)
@@ -47,11 +52,11 @@ def run_generate_j_e_weekly(
     path_conferences_journals_json: str,
 ):
     # Expand and normalize file paths
-    path_weekly_docs = expand_path(path_weekly_docs)
+    path_weekly_docs, path_spidering_bibs = expand_paths(path_weekly_docs, path_spidering_bibs)
 
-    _, path_spidering_bibs, path_conferences_journals_json, full_json_c, full_json_j, full_json_k, options_ = (
-        build_options(options, "", path_spidering_bibs, path_conferences_journals_json)
-    )
+    # Update options
+    options_ = build_base_options([], [], ["arXiv"], [], path_conferences_journals_json)
+    options_.update(options)
     options_["early_access"] = True
 
     # Generate md and html files
@@ -73,6 +78,11 @@ def run_generate_j_e_weekly(
 
     # Generate links
     for keywords_category_name in keywords_category_names:
+        full_json_c, full_json_j, full_json_k = (
+            options_["full_json_c"],
+            options_["full_json_j"],
+            options_["full_json_k"],
+        )
         output_basename = os.path.join("data", "Weekly")
         generator = PaperLinksGenerator(full_json_c, full_json_j, full_json_k, path_weekly_docs, keywords_category_name)
         generator.generate_ieee_early_access_links(output_basename)
@@ -87,11 +97,11 @@ def run_generate_j_monthly(
     path_conferences_journals_json: str,
 ):
     # Expand and normalize file paths
-    path_monthly_docs = expand_path(path_monthly_docs)
+    path_monthly_docs, path_spidering_bibs = expand_paths(path_monthly_docs, path_spidering_bibs)
 
-    _, path_spidering_bibs, path_conferences_journals_json, full_json_c, full_json_j, full_json_k, options_ = (
-        build_options(options, "", path_spidering_bibs, path_conferences_journals_json)
-    )
+    # Update options
+    options_ = build_base_options([], [], ["arXiv"], [], path_conferences_journals_json)
+    options_.update(options)
 
     # Generate md and html files
     for gc in ["generate_data", "combine_data"]:
@@ -110,6 +120,11 @@ def run_generate_j_monthly(
 
     # Generate links
     for keywords_category_name in keywords_category_names:
+        full_json_c, full_json_j, full_json_k = (
+            options_["full_json_c"],
+            options_["full_json_j"],
+            options_["full_json_k"],
+        )
         output_basename = os.path.join("data", "Monthly")
         generator = PaperLinksGenerator(
             full_json_c, full_json_j, full_json_k, path_monthly_docs, keywords_category_name
@@ -127,11 +142,11 @@ def run_generate_j_yearly(
     year_list: list[str],
 ):
     # Expand and normalize file paths
-    path_yearly_docs = expand_path(path_yearly_docs)
+    path_yearly_docs, path_spidered_bibs = expand_paths(path_yearly_docs, path_spidered_bibs)
 
-    path_spidered_bibs, _, path_conferences_journals_json, full_json_c, full_json_j, full_json_k, options_ = (
-        build_options(options, path_spidered_bibs, "", path_conferences_journals_json)
-    )
+    # Update options
+    options_ = build_base_options([], [], ["arXiv"], [], path_conferences_journals_json)
+    options_.update(options)
 
     # Generate md and html files
     for gc in ["generate_data", "combine_data"]:
@@ -146,6 +161,11 @@ def run_generate_j_yearly(
 
     # Generate links
     for keywords_category_name in keywords_category_names:
+        full_json_c, full_json_j, full_json_k = (
+            options_["full_json_c"],
+            options_["full_json_j"],
+            options_["full_json_k"],
+        )
         output_basename = os.path.join("data", "Yearly")
         generator = PaperLinksGenerator(full_json_c, full_json_j, full_json_k, path_yearly_docs, keywords_category_name)
         generator.generate_yearly_links("Journals", output_basename)
@@ -161,11 +181,11 @@ def run_generate_c_yearly(
     year_list: list[str],
 ):
     # Expand and normalize file paths
-    path_yearly_docs = expand_path(path_yearly_docs)
+    path_yearly_docs, path_spidered_bibs = expand_paths(path_yearly_docs, path_spidered_bibs)
 
-    path_spidered_bibs, _, path_conferences_journals_json, full_json_c, full_json_j, full_json_k, options_ = (
-        build_options(options, path_spidered_bibs, "", path_conferences_journals_json)
-    )
+    # Update options
+    options_ = build_base_options([], [], ["arXiv"], [], path_conferences_journals_json)
+    options_.update(options)
 
     # Generate md and html files
     for gc in ["generate_data", "combine_data"]:
@@ -180,6 +200,11 @@ def run_generate_c_yearly(
 
     # Generate links
     for keywords_category_name in keywords_category_names:
+        full_json_c, full_json_j, full_json_k = (
+            options_["full_json_c"],
+            options_["full_json_j"],
+            options_["full_json_k"],
+        )
         output_basename = os.path.join("data", "Yearly")
         generator = PaperLinksGenerator(full_json_c, full_json_j, full_json_k, path_yearly_docs, keywords_category_name)
         generator.generate_yearly_links("Conferences", output_basename)

{pyeasyphd-0.3.9 → pyeasyphd-0.3.10}/pyeasyphd/scripts/run_search.py

@@ -6,7 +6,7 @@ from pybibtexer.tools import compare_bibs_with_zotero
 
 from pyeasyphd.tools import Searchkeywords
 
-from ._base import build_base_options, build_search_options, expand_path
+from ._base import build_base_options, build_search_options, expand_path, expand_paths
 
 
 def run_search_for_screen(
@@ -29,9 +29,9 @@ def run_search_for_screen(
         path_conferences_journals_json: Path to conferences/journals JSON files
     """
     # Expand and normalize file paths
-    path_spidered_bibs = expand_path(path_spidered_bibs)
-    path_spidering_bibs = expand_path(path_spidering_bibs)
-    path_conferences_journals_json = expand_path(path_conferences_journals_json)
+    path_spidered_bibs, path_spidering_bibs, path_conferences_journals_json = expand_paths(
+        path_spidered_bibs, path_spidering_bibs, path_conferences_journals_json
+    )
 
     # Configure search options
     options = {
@@ -72,9 +72,9 @@ def run_search_for_files(
     """
     # Expand and normalize file paths
     path_main_output = expand_path(path_main_output)
-    path_spidered_bibs = expand_path(path_spidered_bibs)
-    path_spidering_bibs = expand_path(path_spidering_bibs)
-    path_conferences_journals_json = expand_path(path_conferences_journals_json)
+    path_spidered_bibs, path_spidering_bibs, path_conferences_journals_json = expand_paths(
+        path_spidered_bibs, path_spidering_bibs, path_conferences_journals_json
+    )
 
     # Configure search options
     options = {

{pyeasyphd-0.3.9 → pyeasyphd-0.3.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyeasyphd"
-version = "0.3.9"
+version = "0.3.10"
 description = "pyeasyphd"
 license = "GPL-3.0-or-later"
 authors = ["NextAI <nextartifintell@gmail.com>"]