Adaptations following changes to express functionality

Author: LukasGold

examples/.env_example

@@ -0,0 +1,3 @@
+OSW_WIKI_DOMAIN=wiki-dev.open-semantic-lab.org
+OSW_CRED_FILEPATH=/path/to/credentials/file
+OSW_DOWNLOAD_DIR=/path/to/download/directory

examples/get_page_content.py

@@ -4,9 +4,13 @@
 go to special pages -> Bot passwords ; follow the instructions)
 """
 
+import dotenv
+
 from osw.express import OswExpress
 from osw.params import GetPageParam
 
+dotenv.load_dotenv()
+
 osw = OswExpress(domain="demo.open-semantic-lab.org")
 
 # the page title of the page to downlaod

examples/inter_osw_copy_page.py

@@ -3,11 +3,11 @@
 
 from pathlib import Path
 
+from opensemantic.v1 import OswBaseModel
 from typing_extensions import List, Optional, Union
 
 from osw.auth import CredentialManager
 from osw.core import OSW
-from osw.model.static import OswBaseModel
 from osw.utils import util
 from osw.wtsite import SLOTS, WtPage, WtSite
 

examples/offline_content_package.py

@@ -1,13 +1,17 @@
 import os
 from pathlib import Path
 
+import dotenv
+
 from osw import wiki_tools
 from osw.auth import CredentialManager
 from osw.core import OSW
 from osw.model.page_package import PagePackage, PagePackageBundle, PagePackageConfig
 from osw.params import CreatePagePackageParam, PageDumpConfig
 from osw.wtsite import WtSite
 
+dotenv.load_dotenv()
+
 # Create/update the password file under examples/accounts.pwd.yaml
 pwd_file_path = os.path.join(
     os.path.dirname(os.path.abspath(__file__)), "accounts.pwd.yaml"

examples/query_minimal.py

@@ -1,5 +1,9 @@
+import dotenv
+
 from osw.express import OswExpress
 
+dotenv.load_dotenv()
+
 # Create an OswExpress object
 domain = "wiki-dev.open-semantic-lab.org"
 osw = OswExpress(domain=domain)

examples/use_express_functions.py

@@ -1,26 +1,30 @@
+import os
 from pathlib import Path
 
-from osw.defaults import params as default_params
-from osw.defaults import paths as default_paths
-
-# The domain, osw.express will be initialized with
-default_params.wiki_domain = "wiki-dev.open-semantic-lab.org"
+import dotenv
 
 from osw.express import OswExpress, osw_download_file, osw_upload_file  # noqa: E402
 
+# Best practise load environment variables from .env file
+dotenv.load_dotenv()  # will look for a .env file in CWD and above
+
+# (Alternative) Setting the domain of the wiki to connect to
+os.environ["OSW_WIKI_DOMAIN"] = "wiki-dev.open-semantic-lab.org"
 # (Optional) Set the default credentials filepath to desired location. Otherwise,
 #  it will use the default location (current working directory)
-# cred_filepath_default.set_default(r"C:\Users\gold\ownCloud\Personal\accounts.pwd.yaml")
-
-# Check setting
-print(f"Credentials loaded from '{str(default_paths.cred_filepath)}'")
+os.environ["OSW_CRED_FILEPATH"] = str(
+    Path(__file__).parent / "osw_files" / "accounts.pwd.yaml"
+)
 
 # The domain to connect to
 domain = "wiki-dev.open-semantic-lab.org"
 # domain = "demo.open-semantic-lab.org"
 # Create an OswExpress object
 osw_obj = OswExpress(domain=domain)
 
+# (Alternative, here equivalent to) loading domain from the environment variable
+osw_obj = OswExpress()
+
 # Create a file
 fp = Path("example.txt")
 with open(fp, "w") as file: