kobai-sdk 0.2.8rc6__tar.gz → 0.2.8rc8__tar.gz

{kobai_sdk-0.2.8rc6 → kobai_sdk-0.2.8rc8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: kobai-sdk
-Version: 0.2.8rc6
+Version: 0.2.8rc8
 Summary: A package that enables interaction with a Kobai tenant.
 Author-email: Ryan Oattes <ryan@kobai.io>
 License:                                  Apache License

{kobai_sdk-0.2.8rc6 → kobai_sdk-0.2.8rc8}/kobai/ai_rag.py

@@ -25,28 +25,28 @@ class AIContext:
 
 def ai_run_question_remote(tc: AIContext, question_id, dynamic_filters: dict = None):
 
-        """
-        Returns JSON formatted result of Kobai question.
+    """
+    Returns JSON formatted result of Kobai question.
 
-        Parameters:
-        question_id (int): Numeric identifier of Kobai question.
-        """
+    Parameters:
+    question_id (int): Numeric identifier of Kobai question.
+    """
 
-        uri = '/data-svcs/api/query/' + str(question_id) + '/execute?' #'/data-svcs/api/query/4518/solution/9/execute/tabular?'
+    uri = '/data-svcs/api/query/' + str(question_id) + '/execute?' #'/data-svcs/api/query/4518/solution/9/execute/tabular?'
 
-        queryParams = {'jsontype': 'tableau'}
+    queryParams = {'jsontype': 'tableau'}
 
-        if bool(dynamic_filters):
-            queryParams.update(dynamic_filters)
+    if bool(dynamic_filters):
+        queryParams.update(dynamic_filters)
 
-        uri += urllib.parse.urlencode(queryParams)
+    uri += urllib.parse.urlencode(queryParams)
 
-        json={
-                'simulations': {'concepts': {}, 'data': None}
-                }
-        response = tc.api_client._TenantAPI__run_post(uri, json)
+    json={
+            'simulations': {'concepts': {}, 'data': None}
+            }
+    response = tc.api_client._TenantAPI__run_post(uri, json)
 
-        return response.json()
+    return response.json()
 
 def generate_sentences(tc: AIContext, replica_schema=None, concept_white_list=None, use_questions=False):
     """
@@ -59,9 +59,6 @@ def generate_sentences(tc: AIContext, replica_schema=None, concept_white_list=No
     use_questions (bool) OPTIONAL: Extract facts from published Kobai questions. 
     """
 
-    #if tc.spark_client is None:
-    #    return None
-
     ss = tc.spark_session
 
     print("Getting Tenant Config")
@@ -152,9 +149,6 @@ def encode_to_delta_local(tc: AIContext, st_model: SentenceTransformer, replica_
     replica_schema (str) OPTIONAL: An alternate schema (catalog.database) to create the Delta table. Useful when the base Kobai schema is not on a Unity Catalog.
     """
 
-    #if tc.spark_client is None:
-    #    return None
-
     ss = tc.spark_session
 
     schema = tc.schema
@@ -224,10 +218,6 @@ def rag_delta(tc: AIContext, emb_model: Union[SentenceTransformer, Embeddings],
     if replica_schema is not None:
         schema = replica_schema
 
-    #if tc.spark_client is None:
-    #    print("Instantiate Spark Client First")
-    #    return None
-
     ss = tc.spark_session
 
     if isinstance(emb_model, SentenceTransformer):

{kobai_sdk-0.2.8rc6 → kobai_sdk-0.2.8rc8}/kobai/tenant_client.py

@@ -2,7 +2,6 @@ import base64
 import json
 import urllib
 import urllib.parse
-import requests
 
 from azure.identity import DeviceCodeCredential
 from pyspark.sql import SparkSession
@@ -65,7 +64,7 @@ class TenantClient:
 # MS Entra Auth
 ########################################
 
-    def authenticate(self, client_id: str, tenant_id: str):
+    def authenticate(self, client_id: str, tenant_id: str, run_ai_init: bool = True, override_username: str = None):
 
         """
         Authenticate the TenantClient with the Kobai instance. Returns nothing, but stores bearer token in client.
@@ -85,6 +84,9 @@ class TenantClient:
         oauth_token = access.serialize()
         user_name = json.loads(access.serialize())["username"]
 
+        if override_username is not None:
+            user_name = override_username
+
         user_name_query_params={ 'userName' : user_name}
         tenants_response = self.api_client._TenantAPI__run_get('/user-mgmt-svcs/auth/tenants?'+urllib.parse.urlencode(user_name_query_params))
 
@@ -110,11 +112,12 @@ class TenantClient:
         
         self.__api_init_session()
         self.__set_tenant_solutionid()
-        self.init_ai_components()
+        if run_ai_init:
+            self.init_ai_components()
         
         print("Authentication Successful.")
 
-    def authenticate_browser_token(self, access_token):
+    def authenticate_browser_token(self, access_token, run_ai_init: bool = True):
 
         """
         Authenticate the TenantClient with the Kobai instance. Returns nothing, but stores bearer token in client.
@@ -128,7 +131,8 @@ class TenantClient:
         
         self.__api_init_session()
         self.__set_tenant_solutionid()
-        self.init_ai_components()
+        if run_ai_init:
+            self.init_ai_components()
 
 
         print("Authentication Successful.")

{kobai_sdk-0.2.8rc6 → kobai_sdk-0.2.8rc8}/kobai_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: kobai-sdk
-Version: 0.2.8rc6
+Version: 0.2.8rc8
 Summary: A package that enables interaction with a Kobai tenant.
 Author-email: Ryan Oattes <ryan@kobai.io>
 License:                                  Apache License

{kobai_sdk-0.2.8rc6 → kobai_sdk-0.2.8rc8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "kobai-sdk"
-version = "0.2.8rc6"
+version = "0.2.8rc8"
 description = "A package that enables interaction with a Kobai tenant."
 readme = "README.md"
 authors = [{ name = "Ryan Oattes", email = "ryan@kobai.io" }]