osw 2.3.2__tar.gz → 2.3.4__tar.gz

{osw-2.3.2 → osw-2.3.4}/CHANGELOG.md

@@ -10,6 +10,35 @@
 
 <!-- version list -->
 
+## v2.3.4 (2026-09-21)
+
+### Bug Fixes
+
+- **core**: Confirm a missing page before reporting a failed store
+  ([`5756436`](https://github.com/OpenSemanticLab/osw-python/commit/5756436e08ba95be3e177c6a78c424bfdba756c8))
+
+- **core**: Verify that store_entity actually created the page
+  ([`f84a529`](https://github.com/OpenSemanticLab/osw-python/commit/f84a5297c605fc458783e5497edeb1f97113053b))
+
+### Chores
+
+- Relicense to Apache-2.0 ([#173](https://github.com/OpenSemanticLab/osw-python/pull/173),
+  [`848615c`](https://github.com/OpenSemanticLab/osw-python/commit/848615cbd1e06401922eda88231a51028440a242))
+
+
+## v2.3.3 (2026-09-08)
+
+### Bug Fixes
+
+- **gui**: Improvements to gui_local_slot_editing
+  ([`a84e73a`](https://github.com/OpenSemanticLab/osw-python/commit/a84e73ad1e2f3a3f7c20eabce748d288bbb531a8))
+
+### Build System
+
+- **deps**: Require pysimplegui>=6 for the UI extra
+  ([`4ca7ab9`](https://github.com/OpenSemanticLab/osw-python/commit/4ca7ab97ad94ad53629db2db513769af648acf5a))
+
+
 ## v2.3.2 (2026-09-07)
 
 ### Bug Fixes

{osw-2.3.2 → osw-2.3.4}/CITATION.cff

@@ -3,7 +3,7 @@ message: "If you use this software, please cite it as below."
 type: software
 title: "OpenSemanticWorld Python Package (osw-python)"
 # Managed by python-semantic-release (version_variables). Do not edit by hand.
-version: 2.3.2
+version: 2.3.4
 abstract: "Python toolset for data processing, queries, wikicode generation and page manipulation within OpenSemanticLab: work with OpenSemanticLab instances as typed pydantic entities, query with semantic search, generate models from wiki schemas, and write changes back."
 repository-code: "https://github.com/OpenSemanticLab/osw-python"
 url: "https://opensemanticlab.github.io/osw-python/"

osw-2.3.4/LICENSE.txt

@@ -0,0 +1,176 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

osw-2.3.4/NOTICE

@@ -0,0 +1,2 @@
+osw-python
+Copyright 2022-2026 Simon Stier and contributors

{osw-2.3.2 → osw-2.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: osw
-Version: 2.3.2
+Version: 2.3.4
 Summary: Python toolset for data processing, queries, wikicode generation and page manipulation
 Project-URL: Homepage, https://github.com/OpenSemanticLab/osw-python
 Project-URL: Documentation, https://opensemanticlab.github.io/osw-python/
@@ -8,7 +8,7 @@ Project-URL: Source, https://github.com/OpenSemanticLab/osw-python
 Project-URL: Changelog, https://github.com/OpenSemanticLab/osw-python/blob/main/CHANGELOG.md
 Project-URL: Download, https://pypi.org/project/osw/#files
 Author-email: OpenSemanticWorld <team@opensemantic.world>
-License-Expression: AGPL-3.0-or-later
+License-Expression: Apache-2.0
 License-File: LICENSE.txt
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
@@ -49,7 +49,7 @@ Requires-Dist: geopy; extra == 'all'
 Requires-Dist: mwparserfromhell; extra == 'all'
 Requires-Dist: openpyxl; extra == 'all'
 Requires-Dist: psycopg2; extra == 'all'
-Requires-Dist: pysimplegui; extra == 'all'
+Requires-Dist: pysimplegui>=6; extra == 'all'
 Requires-Dist: sqlalchemy; extra == 'all'
 Provides-Extra: dataimport
 Requires-Dist: deepl; extra == 'dataimport'
@@ -65,7 +65,7 @@ Requires-Dist: deepl; extra == 'tutorial'
 Requires-Dist: geopy; extra == 'tutorial'
 Requires-Dist: openpyxl; extra == 'tutorial'
 Provides-Extra: ui
-Requires-Dist: pysimplegui; extra == 'ui'
+Requires-Dist: pysimplegui>=6; extra == 'ui'
 Provides-Extra: wikitext
 Requires-Dist: mwparserfromhell; extra == 'wikitext'
 Provides-Extra: workflow

{osw-2.3.2 → osw-2.3.4}/examples/gui_local_slot_editing.py

@@ -3,6 +3,7 @@ them locally and uploading them again."""
 
 import json
 import os
+import re
 
 # import yaml
 from pathlib import Path
@@ -52,6 +53,33 @@ def str_or_none(value):
         return str(value)
 
 
+def compute_page_storage_path(
+    working_dir: str,
+    domain_str: str,
+    page_name_as_filename: bool,
+    label_str: str = None,
+    top_level: str = None,
+) -> str:
+    """Compute the folder that a page's slots are downloaded to / uploaded from.
+
+    Mirrors the folder-naming logic previously inlined in save_as_page_package: the
+    page label is used when 'page_name_as_filename' is set and a label is known,
+    otherwise the top-level page title is used. A domain sub folder is inserted so
+    that pages from different OSW instances don't collide inside the same local
+    working directory.
+
+    Both the '-DL-' (download) and '-UL-' (upload) event handlers call this helper
+    so they always agree on where a given page's content is stored on disk.
+    """
+    if page_name_as_filename and label_str is not None:
+        page_dir_name = label_str
+    else:
+        page_dir_name = top_level
+    # Sanitize the domain for use as a directory name (invalid on Windows: \/:*?"<>|)
+    domain_dir = re.sub(r'[\\/:*?"<>|]', "_", domain_str)
+    return os.path.join(working_dir, domain_dir, page_dir_name)
+
+
 def create_config_from_setting(settings_: dict) -> WtPage.PageDumpConfig:
     config_ = WtPage.PageDumpConfig(
         target_dir=settings_["local_working_directory"],
@@ -66,6 +94,7 @@ def save_as_page_package(
     full_page_name_str,
     wtsite_inst: WtSite,
     dump_config_inst: WtPage.PageDumpConfig,
+    domain_str: str,
     label_str: str = None,
     top_level: str = None,
     sub_level: str = None,  # "content"
@@ -81,10 +110,13 @@ def save_as_page_package(
     package_branch = "deleteme"
     publisher = "Open Semantic World"
     working_dir = dump_config_inst.target_dir
-    if dump_config_inst.page_name_as_filename and label_str is not None:
-        target_dir = os.path.join(working_dir, label_str)
-    else:
-        target_dir = os.path.join(working_dir, top_level)
+    target_dir = compute_page_storage_path(
+        working_dir,
+        domain_str,
+        dump_config_inst.page_name_as_filename,
+        label_str,
+        top_level,
+    )
     if isinstance(author, list):
         author_list = author
     elif isinstance(author, str):
@@ -156,24 +188,46 @@ if __name__ == "__main__":
         }
         settings_read_from_file = False
 
-    domains, accounts = read_domains_from_credentials_file(settings["cred_filepath"])
-    if "wiki-dev.open-semantic-lab.org" in domains:
-        domain = "wiki-dev.open-semantic-lab.org"
+    # An empty/missing accounts.pwd.yaml must not prevent the window from opening.
+    #  The user can still type/select a domain once the window is up.
+    domains, accounts, cred_load_error = [], {}, None
+    try:
+        domains, accounts = read_domains_from_credentials_file(
+            settings["cred_filepath"]
+        )
+    except (FileNotFoundError, ValueError) as e:
+        cred_load_error = f"{type(e).__name__}: {e}"
+
+    if domains:
+        if "wiki-dev.open-semantic-lab.org" in domains:
+            domain = "wiki-dev.open-semantic-lab.org"
+        else:
+            domain = domains[0]
+        if settings_read_from_file:
+            settings["domain"] = domain
     else:
-        domain = domains[0]
-    if settings_read_from_file:
-        settings["domain"] = domain
+        domain = settings.get("domain", "")
 
     cm = CredentialManager(cred_filepath=settings["cred_filepath"])
-    osw_obj = OswExpress(domain=domain, cred_mngr=cm)
-    wtsite_obj = osw_obj.site
+    osw_obj = None
+    wtsite_obj = None
+    if domain:
+        osw_obj = OswExpress(domain=domain, cred_mngr=cm)
+        wtsite_obj = osw_obj.site
 
     full_page_name = settings["target_page"].split("/")[-1].replace("_", " ")
-    page = wtsite_obj.get_page(WtSite.GetPageParam(titles=[full_page_name])).pages[0]
+    page = None
+    if wtsite_obj is not None:
+        page = wtsite_obj.get_page(WtSite.GetPageParam(titles=[full_page_name])).pages[
+            0
+        ]
     label_set = False
     label = None
     slots_downloaded = False
     dump_config = create_config_from_setting(settings)
+    label_default_text = ""
+    if cred_load_error is not None:
+        label_default_text = f"Could not load credentials: {cred_load_error}"
 
     # ----- GUI Definition -----
     # Setting the theme of the GUI
@@ -253,7 +307,12 @@ if __name__ == "__main__":
                 ],
                 [
                     # A display element that will show the label of the OSW page
-                    psg.Multiline(size=(50, 1), key="-LABEL-", no_scrollbar=True)
+                    psg.Multiline(
+                        size=(50, 1),
+                        key="-LABEL-",
+                        no_scrollbar=True,
+                        default_text=label_default_text,
+                    )
                 ],
             ]),
         ],
@@ -354,10 +413,17 @@ if __name__ == "__main__":
                 json.dump(settings, f, indent=4)
         elif event == "-CREDENTIALS-":
             settings["cred_filepath"] = values["-CREDENTIALS-"]
-            domains, accounts = read_domains_from_credentials_file(
-                settings["cred_filepath"]
-            )
-            window["-DOMAIN-"].update(values=domains)
+            try:
+                domains, accounts = read_domains_from_credentials_file(
+                    settings["cred_filepath"]
+                )
+                window["-DOMAIN-"].update(values=domains)
+            except (FileNotFoundError, ValueError) as e:
+                # Keep the previously loaded domains/accounts, the user can retry
+                #  with a different file.
+                window["-LABEL-"].update(
+                    f"Could not load credentials: {type(e).__name__}: {e}"
+                )
         elif event == "-LWD-":
             settings["local_working_directory"] = values["-LWD-"]
         elif event == "-DOMAIN-":
@@ -368,51 +434,82 @@ if __name__ == "__main__":
         elif event == "Load page":
             window["-LABEL-"].update("Loading page...")
             window["-DL_RES-"].update("")
-            full_page_name = values["-ADDRESS-"].split("/")[-1].replace("_", " ")
-            if (values["-ADDRESS-"].find("/wiki/") != -1) or (
-                values["-ADDRESS-"].find("/w/") != -1
-            ):
-                settings["target_page"] = values["-ADDRESS-"]
-            else:
-                settings["target_page"] = (
-                    "https://" + domain + "/wiki/" + full_page_name
+            if wtsite_obj is None:
+                window["-LABEL-"].update(
+                    "No domain selected. Load a credentials file or select a "
+                    "domain first."
                 )
-            if values["-ADDRESS-"].find(settings["domain"]) == -1:
-                window["-LABEL-"].update("Page not on selected domain!")
                 label_set = False
             else:
-                # use connection
-                page = wtsite_obj.get_page(
-                    WtSite.GetPageParam(titles=[full_page_name])
-                ).pages[0]
-                if page.exists:
-                    jsondata = page.get_slot_content("jsondata")
-                    if jsondata is None:
-                        window["-LABEL-"].update("Slot 'jsondata' is empty!")
-                        label_set = False
-                    else:
-                        label = jsondata["label"][0]["text"]
-                        window["-LABEL-"].update(label)
-                        label_set = True
+                full_page_name = values["-ADDRESS-"].split("/")[-1].replace("_", " ")
+                if (values["-ADDRESS-"].find("/wiki/") != -1) or (
+                    values["-ADDRESS-"].find("/w/") != -1
+                ):
+                    settings["target_page"] = values["-ADDRESS-"]
                 else:
-                    window["-LABEL-"].update("Page does not exist!")
+                    settings["target_page"] = (
+                        "https://" + domain + "/wiki/" + full_page_name
+                    )
+                if values["-ADDRESS-"].find(settings["domain"]) == -1:
+                    window["-LABEL-"].update("Page not on selected domain!")
                     label_set = False
+                else:
+                    # use connection
+                    page = wtsite_obj.get_page(
+                        WtSite.GetPageParam(titles=[full_page_name])
+                    ).pages[0]
+                    if page.exists:
+                        jsondata = page.get_slot_content("jsondata")
+                        if jsondata is None:
+                            window["-LABEL-"].update("Slot 'jsondata' is empty!")
+                            label_set = False
+                        else:
+                            label = jsondata["label"][0]["text"]
+                            window["-LABEL-"].update(label)
+                            label_set = True
+                    else:
+                        window["-LABEL-"].update("Page does not exist!")
+                        label_set = False
         elif event == "-EXC_EMPTY-" or event == "-INC_EMPTY-":
             settings["dump_empty_slots"] = values["-INC_EMPTY-"]
         elif event == "-DL-":
             window["-DL_RES-"].update("Downloading slots...")
             if label_set:
-                dump_config = create_config_from_setting(settings)
-                _ = save_as_page_package(
-                    full_page_name_str=full_page_name,
-                    wtsite_inst=wtsite_obj,
-                    dump_config_inst=dump_config,
-                    label_str=label,
-                    sub_level=SUB_LEVEL,
-                    author=accounts[domains[0]]["username"],
-                )
-                slots_downloaded = True
-                window["-DL_RES-"].update("Slots downloaded!")
+                try:
+                    dump_config = create_config_from_setting(settings)
+                    target_dir = compute_page_storage_path(
+                        settings["local_working_directory"],
+                        domain,
+                        settings["page_name_as_filename"],
+                        label,
+                        full_page_name.split(":")[-1],
+                    )
+                    window["-DL_RES-"].update(
+                        f"Clearing '{target_dir}' and downloading slots..."
+                    )
+                    # Look up the author for the selected domain, not the first
+                    #  one in the list, and degrade gracefully if there is no
+                    #  credential entry for it (e.g. empty accounts.pwd.yaml).
+                    author = accounts.get(domain, {}).get("username")
+                    if author is None:
+                        window["-DL_RES-"].update(
+                            f"No credentials found for domain '{domain}'; "
+                            "using default author."
+                        )
+                        author = "Open Semantic World"
+                    _ = save_as_page_package(
+                        full_page_name_str=full_page_name,
+                        wtsite_inst=wtsite_obj,
+                        dump_config_inst=dump_config,
+                        domain_str=domain,
+                        label_str=label,
+                        sub_level=SUB_LEVEL,
+                        author=author,
+                    )
+                    slots_downloaded = True
+                    window["-DL_RES-"].update("Slots downloaded!")
+                except Exception as e:
+                    window["-DL_RES-"].update(f"{type(e).__name__}: {e}")
             else:
                 window["-DL_RES-"].update("No page loaded!")
         elif event == "-UL_SEL-":
@@ -434,29 +531,45 @@ if __name__ == "__main__":
             elif len(slots_to_upload) == 0:
                 window["-UL_RES-"].update("No slots selected!")
             else:
-                if not slots_downloaded:
-                    window["-UL_RES-"].update("No slots downloaded!")
-                    dump_config = create_config_from_setting(settings)
-                window["-UL_RES-"].update("Uploading slots...")
-                if SUB_LEVEL is None:
-                    storage_path = Path(dump_config.target_dir)
-                else:
-                    storage_path = Path(dump_config.target_dir).parent
-                pages = wtsite_obj.read_page_package(
-                    WtSite.ReadPagePackageParam(
-                        storage_path=storage_path,
-                        packages_info_file_name=PACKAGE_INFO_FILE_NAME,
-                        selected_slots=slots_to_upload,
-                        debug=False,
+                try:
+                    # Recompute the storage path the same way the download path
+                    #  does, instead of trusting a possibly stale dump_config.
+                    #  This also makes upload work against a folder written by a
+                    #  previous run, even if no download happened this session.
+                    storage_path = Path(
+                        compute_page_storage_path(
+                            settings["local_working_directory"],
+                            domain,
+                            settings["page_name_as_filename"],
+                            label,
+                            full_page_name.split(":")[-1],
+                        )
                     )
-                ).pages
-                param = wtsite_obj.UploadPageParam(pages=pages, parallel=False)
-                wtsite_obj.upload_page(param)
-                # Success:
-                window["-UL_RES-"].update("Slots uploaded!")
-                # Report in the download section that the slots have been uploaded to
-                #  remind the user that he eventually has to re-download the slots
-                window["-DL_RES-"].update("Slots uploaded!")
+                    if not slots_downloaded:
+                        window["-UL_RES-"].update(
+                            "No slots downloaded this session, trying folder from a "
+                            f"previous run at '{storage_path}'..."
+                        )
+                    else:
+                        window["-UL_RES-"].update("Uploading slots...")
+                    pages = wtsite_obj.read_page_package(
+                        WtSite.ReadPagePackageParam(
+                            storage_path=storage_path,
+                            packages_info_file_name=PACKAGE_INFO_FILE_NAME,
+                            selected_slots=slots_to_upload,
+                            debug=False,
+                        )
+                    ).pages
+                    param = wtsite_obj.UploadPageParam(pages=pages, parallel=False)
+                    wtsite_obj.upload_page(param)
+                    # Success:
+                    window["-UL_RES-"].update("Slots uploaded!")
+                    # Report in the download section that the slots have been
+                    #  uploaded to remind the user that he eventually has to
+                    #  re-download the slots
+                    window["-DL_RES-"].update("Slots uploaded!")
+                except Exception as e:
+                    window["-UL_RES-"].update(f"{type(e).__name__}: {e}")
 
         # Some debugging output functionality
         if DEBUG:

{osw-2.3.2 → osw-2.3.4}/pyproject.toml

@@ -3,12 +3,12 @@ name = "osw"
 description = "Python toolset for data processing, queries, wikicode generation and page manipulation"
 authors = [{ name = "OpenSemanticWorld", email = "team@opensemantic.world" }]
 readme = "README.md"
-license = "AGPL-3.0-or-later"
+license = "Apache-2.0"
 license-files = ["LICENSE.txt"]
 requires-python = ">=3.10,<3.14"
 # Managed by python-semantic-release (see [tool.semantic_release]). Do not
 # edit by hand; it is bumped automatically on merge to main.
-version = "2.3.2"
+version = "2.3.4"
 classifiers = [
     "Development Status :: 3 - Alpha",
     "Intended Audience :: Developers",
@@ -68,7 +68,11 @@ dataimport = [
     "deepl",
     "openpyxl",
 ]
-UI = ["pysimplegui"]
+UI = [
+    # PySimpleGUI 5 was commercial and its releases are yanked from PyPI.
+    # The LGPLv3 line resumed at version 6, which the GUI examples target.
+    "pysimplegui>=6",
+]
 workflow = [
     "prefect>=2.20.25,<3.0",
     # prefect 2.20.25 is the final 2.x release (no backports). Its