kodexa 7.0.1a8003211616__py3-none-any.whl → 7.0.1a9196667375__py3-none-any.whl

kodexa/platform/kodexa.py

@@ -39,12 +39,33 @@ logger = logging.getLogger()
 dirs = AppDirs("Kodexa", "Kodexa")
 
 
-def get_config(profile="default"):
+def get_profile(profile=None):
+    """
+    Gets the current profile.
+
+    Args:
+        profile (str, optional): The profile to get. Defaults to None.
+
+    Returns:
+        str: The profile if it is defined, or "default" if it is not.
+    """
+    kodexa_config = get_config()
+    if profile is None:
+        if "_current_profile_" in kodexa_config:
+            return kodexa_config["_current_profile_"]
+        else:
+            return "default"
+    return profile
+
+CURRENT_CONFIG = None
+
+def get_config(profile=None, create=False):
     """
     Gets the kodexa config object used for local PAT storage.
 
     Args:
-        profile (str, optional): The profile to get the config for. Defaults to None.
+        profile (str, optional): The profile to get the config for. Defaults to current profile or "default"
+        create (bool, optional): Whether to create a new profile if it does not exist. Defaults to False.
 
     Returns:
         dict: The kodexa config as a dictionary. If the profile exists in the config, it returns the config for that profile.
@@ -52,17 +73,34 @@ def get_config(profile="default"):
         it returns the default config. If the config file does not exist, it returns a default config or a new profile with
         default values depending on whether a profile was provided or not.
     """
+    global CURRENT_CONFIG
+    if CURRENT_CONFIG:
+        return CURRENT_CONFIG
+
     path = os.path.join(dirs.user_config_dir, ".kodexa.json")
     if os.path.exists(path):
         with open(path, "r") as outfile:
             kodexa_config = json.load(outfile)
+
+            if "_current_profile_" in kodexa_config and profile is None:
+                profile = kodexa_config["_current_profile_"]
+                if profile is None:
+                    raise Exception("No profile set")
+            else:
+                profile = "default" if profile is None else profile
+
             if profile not in kodexa_config:
-                kodexa_config[profile] = {
-                    "url": None,
-                    "access_token": None,
-                }
+                if create:
+                    kodexa_config[profile] = {
+                        "url": None,
+                        "access_token": None,
+                    }
+                else:
+                    raise Exception(f"Profile {profile} does not exist")
+            CURRENT_CONFIG = kodexa_config
             return kodexa_config
     else:
+        profile = "default" if profile is None else profile
         return (
             {profile: {"url": None, "access_token": None}}
         )
@@ -87,6 +125,8 @@ def save_config(config_obj):
                 raise
     with open(path, "w") as outfile:
         json.dump(config_obj, outfile)
+        global CURRENT_CONFIG
+        CURRENT_CONFIG = config_obj
 
 
 class KodexaPlatform:
@@ -120,7 +160,7 @@ class KodexaPlatform:
         return KodexaClient(KodexaPlatform.get_url(), KodexaPlatform.get_access_token())
 
     @staticmethod
-    def get_access_token(profile="default") -> str:
+    def get_access_token(profile=None) -> str:
         """
         Get the access token.
 
@@ -135,11 +175,11 @@ class KodexaPlatform:
         return (
             access_token
             if access_token is not None
-            else kodexa_config[profile]["access_token"]
+            else kodexa_config[get_profile(profile)]["access_token"]
         )
 
     @staticmethod
-    def get_url(profile="default") -> str:
+    def get_url(profile=None) -> str:
         """
         Get the URL to use to access a Kodexa Platform.
 
@@ -154,7 +194,7 @@ class KodexaPlatform:
         return (
             env_url
             if env_url is not None
-            else kodexa_config[profile]["url"]
+            else kodexa_config[get_profile(profile)]["url"]
         )
 
     @staticmethod
@@ -202,16 +242,19 @@ class KodexaPlatform:
         return [org_slug, slug, version]
 
     @classmethod
-    def configure(cls, kodexa_url, access_token, profile="default"):
+    def configure(cls, kodexa_url, access_token, profile=None):
         """
         Configure kodexa access to platform
 
         Args
             kodexa_url (str): The URL of the Kodexa platform.
             access_token (str): The access token to use.
-            profile (str, optional): The profile to use. Defaults to None.
+            profile (str, optional): The profile to use. Defaults to current profile or "default".
         """
         kodexa_config = get_config(profile)
+
+        kodexa_config["_current_profile_"] = profile
+
         kodexa_config[profile] = {
             "url": kodexa_url,
             "access_token": access_token,
@@ -220,27 +263,56 @@ class KodexaPlatform:
         save_config(kodexa_config)
 
     @classmethod
-    def login(cls, kodexa_url, username, password, profile="default"):
+    def list_profiles(cls):
+        kodexa_config = get_config()
+
+        # its the keys without __current_profile__
+        return [key for key in kodexa_config if key != "_current_profile_"]
+
+    @classmethod
+    def get_current_profile(cls):
+        return get_profile()
+
+    @classmethod
+    def set_profile(cls, profile):
+        kodexa_config = get_config(profile)
+        kodexa_config["_current_profile_"] = profile
+        save_config(kodexa_config)
+
+    @classmethod
+    def delete_profile(cls, profile):
+        kodexa_config = get_config(profile)
+        del kodexa_config[profile]
+
+        if kodexa_config["_current_profile_"] == profile:
+            kodexa_config["_current_profile_"] = "default"
+
+        save_config(kodexa_config)
+
+    @classmethod
+    def login(cls, kodexa_url, token, profile=None):
         """
         Login to the Kodexa platform.
 
         Args:
             kodexa_url (str): The URL of the Kodexa platform.
-            username (str): The username to use for login.
-            password (str): The password to use for login.
+            token (str): The token to use for login.
             profile (str, optional): The profile to use. Defaults to None.
         """
         from requests.auth import HTTPBasicAuth
 
         obj_response = requests.get(
-            f"{kodexa_url}/api/account/me/token",
-            auth=HTTPBasicAuth(username, password),
-            headers={"content-type": "application/json"}
+            f"{kodexa_url}/api/account/me",
+            headers={"content-type": "application/json", "x-access-token": token, "cf-access-token": os.environ.get("CF_TOKEN", "")}
         )
         if obj_response.status_code == 200:
-            kodexa_config = get_config(profile)
+            kodexa_config = get_config(profile, create=True)
+
+            if profile not in kodexa_config:
+                kodexa_config[profile] = {}
+
             kodexa_config[profile]["url"] = kodexa_url
-            kodexa_config[profile]["access_token"] = obj_response.text
+            kodexa_config[profile]["access_token"] = token
             save_config(kodexa_config)
             print("Logged in")
         else:
@@ -258,13 +330,17 @@ class KodexaPlatform:
             f"{KodexaPlatform.get_url()}/api",
             headers={
                 "x-access-token": KodexaPlatform.get_access_token(),
+                "cf-access-token": os.environ.get("CF_TOKEN", ""),
                 "content-type": "application/json",
             },
         )
         if r.status_code == 401:
             raise Exception("Your access token was not authorized")
         if r.status_code == 200:
-            return r.json()
+            try:
+                return r.json()
+            except JSONDecodeError:
+                raise Exception("Unable to decode server information, check your access token")
 
         logger.warning(r.text)
         raise Exception(
@@ -307,7 +383,8 @@ class RemoteSession:
         logger.debug(f"Downloading metadata for action {ref}")
         r = requests.get(
             f"{KodexaPlatform.get_url()}/api/actions/{ref.replace(':', '/')}",
-            headers={"x-access-token": KodexaPlatform.get_access_token()},
+            headers={"x-access-token": KodexaPlatform.get_access_token(),
+                     "cf-access-token": os.environ.get("CF_TOKEN", "")},
         )
         if r.status_code == 401:
             raise Exception("Your access token was not authorized")
@@ -327,7 +404,8 @@ class RemoteSession:
         r = requests.post(
             f"{KodexaPlatform.get_url()}/api/sessions",
             params={self.session_type: self.slug},
-            headers={"x-access-token": KodexaPlatform.get_access_token()},
+            headers={"x-access-token": KodexaPlatform.get_access_token(),
+                     "cf-access-token": os.environ.get("CF_TOKEN", "")},
         )
 
         process_response(r)
@@ -366,7 +444,8 @@ class RemoteSession:
             f"{KodexaPlatform.get_url()}/api/sessions/{self.cloud_session.id}/execute",
             params={self.session_type: self.slug, "documentVersion": document.version},
             data=data,
-            headers={"x-access-token": KodexaPlatform.get_access_token()},
+            headers={"x-access-token": KodexaPlatform.get_access_token(),
+                     "cf-access-token": os.environ.get("CF_TOKEN", "")},
             files=files,
         )
         try:
@@ -410,7 +489,8 @@ class RemoteSession:
         while execution.status == "PENDING" or execution.status == "RUNNING":
             r = requests.get(
                 f"{KodexaPlatform.get_url()}/api/sessions/{self.cloud_session.id}/executions/{execution.id}",
-                headers={"x-access-token": KodexaPlatform.get_access_token()},
+                headers={"x-access-token": KodexaPlatform.get_access_token(),
+                         "cf-access-token": os.environ.get("CF_TOKEN", "")},
             )
             try:
                 execution = json.loads(r.text)
@@ -466,7 +546,8 @@ class RemoteSession:
             logger.info(f"Downloading output document [{execution.outputId}]")
             doc = requests.get(
                 f"{KodexaPlatform.get_url()}/api/sessions/{self.cloud_session.id}/executions/{execution.id}/objects/{execution.outputId}",
-                headers={"x-access-token": KodexaPlatform.get_access_token()},
+                headers={"x-access-token": KodexaPlatform.get_access_token(),
+                         "cf-access-token": os.environ.get("CF_TOKEN", "")},
             )
             return Document.from_kddb(doc.content)
 
@@ -637,13 +718,14 @@ class RemoteStep:
 
     """Allows you to interact with a step that has been deployed in the Kodexa platform"""
 
-    def __init__(self, ref, step_type="ACTION", attach_source=False, options=None):
+    def __init__(self, ref, step_type="ACTION", attach_source=False, options=None, conditional=None):
         if options is None:
             options = {}
         self.ref = ref
         self.step_type = step_type
         self.attach_source = attach_source
         self.options = options
+        self.conditional = conditional
 
     def to_dict(self):
         """Converts the RemoteStep object to a dictionary.
@@ -651,7 +733,7 @@ class RemoteStep:
         Returns:
             dict: Dictionary representation of the RemoteStep object.
         """
-        return {"ref": self.ref, "step_type": self.step_type, "options": self.options}
+        return {"ref": self.ref, "step_type": self.step_type, "options": self.options, "conditional": self.conditional}
 
     def get_name(self):
         """Generates a name for the RemoteStep object.
@@ -705,7 +787,7 @@ class RemoteStep:
         Returns:
             dict: Dictionary representing the configuration of the step.
         """
-        return {"ref": self.ref, "options": self.options}
+        return {"ref": self.ref, "options": self.options, "conditional": self.conditional}
 
 
 class EventHelper:
@@ -754,7 +836,8 @@ class EventHelper:
         response = requests.post(
             f"{KodexaPlatform.get_url()}/api/sessions/{self.event.session_id}/executions/{self.event.execution.id}/logs",
             json=[{"entry": message}],
-            headers={"x-access-token": KodexaPlatform.get_access_token()},
+            headers={"x-access-token": KodexaPlatform.get_access_token(),
+                     "cf-access-token": os.environ.get("CF_TOKEN", "")},
             timeout=300,
         )
         if response.status_code != 200:
@@ -778,7 +861,8 @@ class EventHelper:
 
         co_response = requests.get(
             f"{KodexaPlatform.get_url()}/api/sessions/{self.event.session_id}/executions/{self.event.execution.id}/objects/{content_object_id}",
-            headers={"x-access-token": KodexaPlatform.get_access_token()},
+            headers={"x-access-token": KodexaPlatform.get_access_token(),
+                     "cf-access-token": os.environ.get("CF_TOKEN", "")},
             timeout=300
         )
         process_response(co_response)
@@ -805,7 +889,8 @@ class EventHelper:
         co_response = requests.post(
             f"{KodexaPlatform.get_url()}/api/sessions/{self.event.session_id}/executions/{self.event.execution.id}/objects",
             data=data,
-            headers={"x-access-token": KodexaPlatform.get_access_token()},
+            headers={"x-access-token": KodexaPlatform.get_access_token(),
+                     "cf-access-token": os.environ.get("CF_TOKEN", "")},
             files=files,
             timeout=300
         )

kodexa/testing/test_components.py

@@ -43,43 +43,3 @@ class TestAssistant(Assistant):
         return AssistantResponse(
             pipelines=[AssistantPipeline(pipeline=pipeline, write_back_to_store=True)]
         )
-
-
-def test_profile_default():
-    """
-    :assert: Checks if the default profile is set correctly
-    """
-    kodexa_url = os.getenv("URL")
-    access_token = os.getenv("ACCESS_TOKEN")
-    KodexaPlatform.configure(kodexa_url, access_token)
-    assert KodexaPlatform.get_url() == kodexa_url and KodexaPlatform.get_access_token() == access_token
-
-
-def test_profile_custom():
-    """
-    :assert: Checks if the custom profile is set correctly
-    """
-    kodexa_url = os.getenv("URL")
-    access_token = os.getenv("ACCESS_TOKEN")
-    profile = "dev-profile"
-    KodexaPlatform.configure(kodexa_url, access_token, profile)
-    assert KodexaPlatform.get_url(profile) == kodexa_url and KodexaPlatform.get_access_token(profile) == access_token
-
-
-def test_kodexa_client_default_profile():
-    kodexa_cli = KodexaClient()
-    assert kodexa_cli.base_url == KodexaPlatform.get_url("default") and \
-           kodexa_cli.access_token == KodexaPlatform.get_access_token("default")
-
-
-def test_kodexa_client_custom_profile():
-    kodexa_cli = KodexaClient(profile="dev-profile")
-    assert kodexa_cli.base_url == KodexaPlatform.get_url("dev-profile") and \
-           kodexa_cli.access_token == KodexaPlatform.get_access_token("dev-profile")
-
-
-def test_customized_kodexe_client():
-    kodexa_url = "https://test.test.com"
-    access_token = "test-token"
-    kodexa_cli = KodexaClient(kodexa_url, access_token)
-    assert kodexa_cli.base_url != KodexaPlatform.get_url() and kodexa_cli.access_token != KodexaPlatform.get_access_token()

kodexa/testing/test_utils.py

@@ -3,6 +3,8 @@ import importlib
 import logging
 from typing import List
 
+from addict import Dict
+
 from kodexa import Assistant, AssistantResponse
 from kodexa import (
     ContentEvent,
@@ -316,7 +318,7 @@ class ExtensionPackUtil:
             import json
 
             with open(file_path, "r") as stream:
-                self.kodexa_metadata = json.load(stream)
+                self.kodexa_metadata = Dict(json.load(stream))
 
     def get_step(self, action_slug, options=None):
         """

{kodexa-7.0.1a8003211616.dist-info → kodexa-7.0.1a9196667375.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kodexa
-Version: 7.0.1a8003211616
+Version: 7.0.1a9196667375
 Summary: Python SDK for the Kodexa Platform
 Author: Austin Redenbaugh
 Author-email: austin@kodexa.com
@@ -17,16 +17,17 @@ Requires-Dist: addict (>=2.4.0,<3.0.0)
 Requires-Dist: appdirs (>=1.4.4,<2.0.0)
 Requires-Dist: better-exceptions (>=0.3.3,<0.4.0)
 Requires-Dist: chevron (>=0.14.0,<0.15.0)
-Requires-Dist: deepdiff (>=6.5.0,<7.0.0)
+Requires-Dist: deepdiff (>=7.0.1,<8.0.0)
 Requires-Dist: msgpack (>=1.0.6,<2.0.0)
 Requires-Dist: ply (>=3.11,<4.0)
 Requires-Dist: pydantic (>=2.5.3,<3.0.0)
 Requires-Dist: pydantic-yaml (>=1.0.0,<2.0.0)
-Requires-Dist: pyfunctional (>=1.4.3,<1.5.0)
+Requires-Dist: pyfunctional (==1.5.0)
 Requires-Dist: python-dateutil (>=2.8.2,<3.0.0)
 Requires-Dist: pyyaml (>=6.0,<7.0)
 Requires-Dist: requests (>=2.28.1,<3.0.0)
 Requires-Dist: semver (>=3.0.1,<4.0.0)
+Requires-Dist: simpleeval (>=0.9.13,<0.10.0)
 Requires-Dist: urllib3 (>=2.0.0,<3.0.0)
 Description-Content-Type: text/markdown
 
@@ -66,18 +67,6 @@ working with a Kodexa platform instance.
 
 Documentation is available at the [Kodexa Documentation Portal](https://docs.kodexa.com)
 
-## Current Development
-
-[//]: # (Replace it with the diagrams and descriptions for build releases)
-**BUILD VERSION FLOW**
-![build-version-flow.png](docs%2Fbuild-version-flow.png)
-Build version will differ based on the branches that are published to pypi.
-
-**GITHUB PROCESS**
-![github-process.png](docs%2Fgithub-process.png)
-Changes that contain bugs, features, and fixes should first be pushed to the test branch. 
-Once these changes are thoroughly tested, they can be submitted as a pull request to the main branch. The pull request should be reviewed and approved by an appropriate person before the changes can be merged.
-
 ## Set-up
 
 We use poetry to manage our dependencies, so you can install them with:

{kodexa-7.0.1a8003211616.dist-info → kodexa-7.0.1a9196667375.dist-info}/RECORD

@@ -5,15 +5,18 @@ kodexa/connectors/__init__.py,sha256=WF6G_MUeU32TlKSUKkpNoNX7dq8iBPliFMep4E8BmZc
 kodexa/connectors/connectors.py,sha256=FpUZDkSyHld2b9eYRuVOWzaFtuGoaRuPXXicJB7THbc,10413
 kodexa/model/__init__.py,sha256=rtLXYJBxB-rnukhslN9rlqoB3--1H3253HyHGbD_Gc8,796
 kodexa/model/base.py,sha256=CaZK8nMhT1LdCpt4aLhebJGcorjq9qRID1FjnXnP14M,521
-kodexa/model/model.py,sha256=Bghea55_XvALtro3_Z3fXsEjGmK2_dTKgPOOC8ZEyyo,115050
-kodexa/model/objects.py,sha256=SrLXuEmy2nEDDN09uza-o3A_Ww7qp3P7wSt_fq_a3r0,171871
-kodexa/model/persistence.py,sha256=JW7CmEyyMfk4h7tWFn5Dj21nFExaeNv8OE7wD6Q7Khs,59492
+kodexa/model/entities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+kodexa/model/entities/product.py,sha256=ZDpHuBE_9FJ-klnkyBvTfPwYOqBkM1wraZMtHqNA8FQ,3526
+kodexa/model/entities/product_subscription.py,sha256=UcmWR-qgLfdV7VCtJNwzgkanoS8nBSL6ngVuxQUK1M8,3810
+kodexa/model/model.py,sha256=xAUPiW_1V9Kn9yitrvKFVuG_ms_N4HlAx23dwGln8Ro,115561
+kodexa/model/objects.py,sha256=ox1tie8X95VTgIEHa220G7qqBeCgsYOATJjkQNtMFFA,174335
+kodexa/model/persistence.py,sha256=sx5FwTSsWMdAZpAs0-6PqyULHkQyNQClApUKJZ-ly8M,62032
 kodexa/pipeline/__init__.py,sha256=sA7f5D6qkdMrpp2xTIeefnrUBI6xxEEWostvxfX_1Cs,236
-kodexa/pipeline/pipeline.py,sha256=cIRFOoJkguIYgNzx6FYrODdBpcY25CM_SULsqSsHeXE,24323
+kodexa/pipeline/pipeline.py,sha256=ZYpJAWcwV4YRK589DUhU0vXGQlkNSj4J2TsGbYqTLjo,25221
 kodexa/platform/__init__.py,sha256=1O3oiWMg292NPL_NacKDnK1T3_R6cMorrPRue_9e-O4,216
-kodexa/platform/client.py,sha256=-TAVAwgV8jWzZ8yG8Ve8c51J5VbGkqmeN4Qk4Ii9nVw,209681
+kodexa/platform/client.py,sha256=ZfdDS0L0DK6Zi88fe2cYCcCqQRLamv2ARXkXL4Z7xww,218016
 kodexa/platform/interaction.py,sha256=6zpcwXKNZstUGNS6m4JsoRXAqCZPJHWI-ZN3co8nnF0,1055
-kodexa/platform/kodexa.py,sha256=UOEyc6fNPx-I5Bg21Bzj5s5R4-W3PVMeJBFX7cnXPKA,30888
+kodexa/platform/kodexa.py,sha256=Bvf6x43FWsFuAuQ4N8TvjSZq6niEtBTESmFCWVPASeQ,34024
 kodexa/selectors/__init__.py,sha256=xA9-4vpyaAZWPSk3bh2kvDLkdv6XEmm7PjFbpziiTIk,100
 kodexa/selectors/ast.py,sha256=gG-1st841IntgBE5V7p3Cq9azaym2jV5lB_AIywQTCI,13269
 kodexa/selectors/core.py,sha256=kkt02DN20gXeaDGoGubPPeeTV7rCr4sxTyELrI0l1YU,3691
@@ -31,11 +34,11 @@ kodexa/spatial/table_form_common.py,sha256=qJIqr6INNFTe8EPrXchZ9a1ZgS9dZnhx_wgvd
 kodexa/steps/__init__.py,sha256=qpmAtYePTv7G-HzUBx087bA3kq-PPGcFJf4_Z5P--0k,179
 kodexa/steps/common.py,sha256=fGEuKxcztcqrYFpXbu_OYkxh42yR9s5mkszmtkJhnQ8,10428
 kodexa/testing/__init__.py,sha256=P8W-SOnWsi48asfnQV06iyHrzZAzuX69j9oYwBvgp5s,323
-kodexa/testing/test_components.py,sha256=qGFHUN6nm6bEOa2ZCN0jDUWsCHRnEcjdcHSRetgIr-E,2571
-kodexa/testing/test_utils.py,sha256=2ioYPXeyvVkE-u5VtgFMW0AyGTvplERgmnKXELAffbY,13990
+kodexa/testing/test_components.py,sha256=g5lP-GY0nTHuH5cIEw45vIejEeBaWkPKQGHL36jejBQ,1052
+kodexa/testing/test_utils.py,sha256=DrLCkHxdb6AbZ-X3WmTMbQmnVIm55VEBL8MjtUK9POs,14021
 kodexa/training/__init__.py,sha256=xs2L62YpRkIRfslQwtQZ5Yxjhm7sLzX2TrVX6EuBnZQ,52
 kodexa/training/train_utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kodexa-7.0.1a8003211616.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-kodexa-7.0.1a8003211616.dist-info/METADATA,sha256=cdZgTE1WuQqDaDDAlRfnQc70Fo-EGKbvaZyT13nmWt8,4076
-kodexa-7.0.1a8003211616.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-kodexa-7.0.1a8003211616.dist-info/RECORD,,
+kodexa-7.0.1a9196667375.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+kodexa-7.0.1a9196667375.dist-info/METADATA,sha256=ObLaHwuOr2TtfFB9qIBrViUL8eR8cg0zK19XjbVoHDM,3488
+kodexa-7.0.1a9196667375.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+kodexa-7.0.1a9196667375.dist-info/RECORD,,