pyformatjson 0.2.9__tar.gz → 0.3.1__tar.gz

{pyformatjson-0.2.9 → pyformatjson-0.3.1}/.github/workflows/release.yml

@@ -41,6 +41,6 @@ jobs:
         uses: softprops/action-gh-release@v2
         with:
           body_path: CHANGELOG.md
-          # generate_release_notes: true
+          generate_release_notes: true
         env:
           GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }}

pyformatjson-0.3.1/.python-version

@@ -0,0 +1 @@
+3.12

{pyformatjson-0.2.9 → pyformatjson-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: pyformatjson
-Version: 0.2.9
+Version: 0.3.1
 Summary: pyformatjson
 Project-URL: Homepage, https://github.com/Easy-PhD/pyformatjson
 Project-URL: Repository, https://github.com/Easy-PhD/pyformatjson
@@ -26,7 +26,7 @@ Requires-Dist: func-timeout>=4.3.5
 Requires-Dist: lxml>=6.0.2
 Requires-Dist: playwright>=1.55.0
 Requires-Dist: psutil>=7.1.2
-Requires-Dist: pyadvtools>=0.3.8
+Requires-Dist: pyadvtools>=0.3.10
 Requires-Dist: requests>=2.32.5
 Requires-Dist: selenium>=4.38.0
 Description-Content-Type: text/markdown

{pyformatjson-0.2.9 → pyformatjson-0.3.1}/docs/requirements.txt

@@ -1,3 +1,4 @@
+ruff>=0.14.3
 mkdocs>=1.6.1
 mkdocs-autorefs>=1.4.3
 mkdocs-material>=9.6.21

pyformatjson-0.2.9/pyformatjson.sublime-project → pyformatjson-0.3.1/main.sublime-project

@@ -8,6 +8,15 @@
             "target": "terminus_exec",
             "cancel": "terminus_cancel_build",
             "shell_cmd": "\".venv/bin/python3\" -u \"$file\"",
+            "windows": {
+                "shell_cmd": "\".venv\\Scripts\\python.exe\" -u \"$file\"",
+            },
+            "osx": {
+                "shell_cmd": "\".venv/bin/python3\" -u \"$file\"",
+            },
+            "linux": {
+                "shell_cmd": "\".venv/bin/python3\" -u \"$file\"",
+            },
             "env": {
                 "PYTHONIOENCODING": "utf-8",
                 "PYTHONPATH": ".",
@@ -17,8 +26,6 @@
     ],
     "settings": {},
     "folders": [
-        {
-            "path": ".",
-        },
+        { "path": ".", },
     ],
 }

{pyformatjson-0.2.9 → pyformatjson-0.3.1}/pyformatjson/core/_base.py

@@ -69,8 +69,8 @@ def split_data_list(split_pattern: str, data_list: list[str], last_next: str = "
     new_data_list = []
     for line in data_list:
         split_list = re.split(split_pattern, line)
-        list_one = split_list[0: len(split_list): 2]
-        list_two = split_list[1: len(split_list): 2]
+        list_one = split_list[0 : len(split_list) : 2]
+        list_two = split_list[1 : len(split_list) : 2]
 
         temp = []
         if last_next == "next":

{pyformatjson-0.2.9 → pyformatjson-0.3.1}/pyformatjson/core/update_json.py

@@ -63,12 +63,45 @@ def update_json_file(full_json_cj: str, conferences_or_journals: str) -> dict[st
 
     # Save updated JSON
     if flag and json_dict:
+        json_dict = add_multiple_add(json_dict, conferences_or_journals)
+
         with open(full_json_cj, "w", encoding="utf-8", newline="\n") as f:
             f.write(json.dumps(json_dict, indent=4, sort_keys=True, ensure_ascii=True))
 
     return json_dict
 
 
+def add_multiple_add(json_dict, conferences_or_journals):
+    for pub in json_dict:
+        for key in json_dict[pub][conferences_or_journals]:
+            names_abbr = json_dict[pub][conferences_or_journals][key].get("names_abbr", [])
+            names_full = json_dict[pub][conferences_or_journals][key].get("names_full", [])
+
+            names_abbr_, names_full_ = [], []
+            for abbr, full in zip(names_abbr, names_full, strict=True):
+                names_abbr_.append(abbr)
+                names_full_.append(full)
+
+                full = full.encode('unicode_escape').decode()
+                if "&" in full and r"\\&" not in full and r"\\\\&" not in full:
+                    full_1 = re.sub("&", r"\\&", full)
+                    full_2 = re.sub("&", r"\\\\&", full)
+                    if full_1 not in names_full:
+                        breakpoint()
+                        names_abbr_.append(abbr)
+                        names_full_.append(full_1)
+
+                    if full_2 not in names_full:
+                        breakpoint()
+                        names_abbr_.append(abbr)
+                        names_full_.append(full_2)
+
+            json_dict[pub][conferences_or_journals][key]["names_abbr"] = names_abbr_
+            json_dict[pub][conferences_or_journals][key]["names_full"] = names_full_
+
+    return json_dict
+
+
 def generate_standard_form(json_dict: dict[str, Any], conferences_or_journals: str):
     # Check for duplicate abbreviations in the data.
     abbr_list = []

{pyformatjson-0.2.9 → pyformatjson-0.3.1}/pyformatjson/tools/generate_dict.py

@@ -469,12 +469,18 @@ class GenerateDataDict:
         # Parse abstract due date
         abstract_due = None
         if due_str := abbr_dict.get("conf_abstract_due", "").strip():
-            abstract_due = datetime.strptime(due_str, "%d/%m/%Y").date()
+            if due_str.upper() == "TBD":
+                abstract_due = "TBD"
+            else:
+                abstract_due = datetime.strptime(due_str, "%d/%m/%Y").date()
 
         # Parse conference start date
         start_date = None
         if start_str := abbr_dict.get("conf_date_start", "").strip():
-            start_date = datetime.strptime(start_str, "%d/%m/%Y").date()
+            if start_str.upper() == "TBD":
+                start_date = "TBD"
+            else:
+                start_date = datetime.strptime(start_str, "%d/%m/%Y").date()
 
         # Get today's date
         today = datetime.strptime(datetime.now().strftime("%d/%m/%Y"), "%d/%m/%Y").date()
@@ -487,15 +493,15 @@ class GenerateDataDict:
 
         if self.for_vue:
             # Vue.js template format
-            if abstract_due:
+            if (abstract_due is not None) and (abstract_due != "TBD"):
                 abstract_indicator = f"**{{{{ diffDate('{abstract_due}') }}}}**"
-            if start_date:
+            if (start_date is not None) and (abstract_due != "TBD"):
                 start_indicator = f"**{{{{ diffDate('{start_date}') }}}}**"
         else:
             # Standard day count format
-            if abstract_due:
+            if (abstract_due is not None) and (abstract_due != "TBD"):
                 abstract_indicator = (abstract_due - today).days if today <= abstract_due else "Expired"
-            if start_date:
+            if (start_date is not None) and (abstract_due != "TBD"):
                 start_indicator = (start_date - today).days if today <= start_date else "Expired"
 
         return abstract_indicator, start_indicator
@@ -520,8 +526,21 @@ class GenerateDataDict:
     ) -> str:
         """Construct conference table row string."""
         # Format date strings
-        abstract_date_str = abstract_due.strftime("%d/%m/%Y") if abstract_due else ""
-        start_date_str = start_date.strftime("%d/%m/%Y") if start_date else ""
+        if abstract_due is None:
+            abstract_date_str = ""
+        else:
+            if abstract_due == "TBD":
+                abstract_date_str = "TBD"
+            else:
+                abstract_date_str = abstract_due.strftime("%d/%m/%Y")
+
+        if start_date is None:
+            start_date_str = ""
+        else:
+            if start_date == "TBD":
+                start_date_str = "TBD"
+            else:
+                start_date_str = start_date.strftime("%d/%m/%Y")
 
         # Format start date with link if available
         start_date_display = self._format_link(start_date_str, year_url) if start_date_str else ""

{pyformatjson-0.2.9 → pyformatjson-0.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyformatjson"
-version = "0.2.9"
+version = "0.3.1"
 description = "pyformatjson"
 license = "GPL-3.0-or-later"
 license-files = ["LICENSE"]
@@ -28,7 +28,7 @@ dependencies = [
     "lxml>=6.0.2",
     "playwright>=1.55.0",
     "psutil>=7.1.2",
-    "pyadvtools>=0.3.8",
+    "pyadvtools>=0.3.10",
     "requests>=2.32.5",
     "selenium>=4.38.0",
 ]

{pyformatjson-0.2.9 → pyformatjson-0.3.1}/scripts/generate_docs.py

@@ -35,7 +35,8 @@ class DocGenerator:
     def get_module_info(self, module_path: Path) -> dict[str, Any]:
         # Calculate relative import path
         relative_path = module_path.relative_to(self.source_dir)
-        module_name = str(relative_path).replace("/", ".").replace("\\", ".").replace(".py", "")
+        module_name = str(relative_path).replace("/", ".").replace("\\", ".")
+        module_name = module_name[:-3]  # replace(".py", "")
 
         return {
             "path": module_path,

pyformatjson-0.3.1/tests/test_main.py

@@ -0,0 +1,18 @@
+import os
+
+from pyformatjson.main import main_generate_md_files
+
+if __name__ == "__main__":
+    full_json_c = os.getenv("FULL_JSON_C", "")
+    full_json_j = os.getenv("FULL_JSON_J", "")
+    full_json_k = os.getenv("FULL_JSON_K", "")
+    path_spidered_bibs = os.getenv("PATH_SPIDERED_BIBS", "")
+    path_output = os.path.join(os.getenv("PATH_AILINKS", ""), "docs", "data")
+
+    main_generate_md_files(full_json_c, full_json_j, full_json_k, path_output, path_spidered_bibs)
+    main_generate_md_files(
+        full_json_c, full_json_j, full_json_k, path_output, path_spidered_bibs, keywords_category_name="S"
+    )
+    main_generate_md_files(
+        full_json_c, full_json_j, full_json_k, path_output, path_spidered_bibs, keywords_category_name="Y"
+    )