kobai-sdk 0.3.3rc1__py3-none-any.whl → 0.3.4__py3-none-any.whl

kobai/ai_rag.py

@@ -7,7 +7,7 @@ from delta import DeltaTable
 from langchain_core.language_models.chat_models import BaseChatModel
 from langchain_core.embeddings import Embeddings
 from langchain_community.document_loaders import PySparkDataFrameLoader
-from langchain import hub
+from langchain_classic import hub
 from langchain_core.output_parsers import StrOutputParser
 
 import urllib

kobai/genie.py

@@ -1,4 +1,3 @@
-import json
 
 def get_genie_descriptions(solution_id, structure, schema):
     for di, dom in enumerate(structure["domains"]):
@@ -82,7 +81,6 @@ def recurse_parent_props(uri, structure, props, rels, visited=None):
                         recurse_parent_props(icon, structure, props, rels, visited)
 
 def add_map_count(structure):
-    #mapping_defs = get_tenant_mapping_config(structure["solution_id"])
 
     for dom in structure["domains"]:
         for con in dom["concepts"]:
@@ -93,41 +91,11 @@ def add_map_count(structure):
                     map_count = map_count + 1
             con["map_count"] = map_count
 
-#def get_tenant_mapping_config(solution_id): 
-#    mapping_sql = f"""
-#        select s.id, mapd.concept_type_uri
-#        from studio.solutions s
-#        inner join studio.mapping_defs mapd 
-#        on s.id = mapd.solution_id
-#        where s.id = {solution_id}
-#    """
-
-#    mapping_rows = app_db.run_query(mapping_sql)
-
-#    mapping_defs = []
-#    for row in mapping_rows:
-#        mapping_def = {"solution_id": row[0], "concept_type_uri": row[1]}
-#        mapping_defs.append(mapping_def)
-#    return mapping_defs
-
 ############################
 # Question Config
 ############################
 
 def get_tenant_question_config(solution_id, structure):
-    #question_sql = f"""
-    #    select s.id solution_id, q.id, q.description, q.definition, a.id api_id
-    #    from studio.models m
-    #    inner join studio.queries q 
-    #    on m.id = q.model_id
-    #    inner join studio.solutions s 
-    #    on m.id = s.model_id
-    #    left join studio.api a 
-    #    on q.id = a.query_id
-    #    where s.id = {solution_id}
-    #"""
-
-    #question_rows = app_db.run_query(question_sql)
 
     question_defs = []
     for row in structure["queries"]:

kobai/tenant_client.py

@@ -5,8 +5,6 @@ import urllib.parse
 
 from pyspark.sql import SparkSession
 
-from langchain_community.chat_models import ChatDatabricks
-from databricks_langchain import DatabricksEmbeddings
 from langchain_core.language_models.chat_models import BaseChatModel
 from langchain_core.embeddings import Embeddings
 
@@ -281,9 +279,10 @@ class TenantClient:
 
         for t in self.__get_view_sql(domains=domains, concepts=concepts, not_concepts=not_concepts, enforce_map=enforce_map):
             payload["table_identifiers"].append(t["table"])
+            print(t["table"])
         response = self.databricks_client._DatabricksClient__api_patch("/api/2.0/data-rooms/" + room_id, payload)
 
-        payload = {"title":"Notes","content":"When filtering for a named entity, use a like comparison instead of equality. All tables are denormalized, so columns may have repeated rows for the same primary identifier. You should handle this by putting each table in a subquery and using the DISTINCT keyword.","instruction_type":"TEXT_INSTRUCTION"}
+        payload = {"title":"Notes","content":"When filtering for a named entity, use a like comparison instead of equality. All tables are denormalized, so columns may have repeated rows for the same primary identifier. You should handle this by putting each table in a subquery and using the DISTINCT keyword. The first column in each view is a unique identifier that should only be used for joins, and never shown to a user. Find another column to identify the subject of the table.","instruction_type":"TEXT_INSTRUCTION"}
         instructions = self.databricks_client._DatabricksClient__api_get("/api/2.0/data-rooms/" + room_id + "/instructions")
         inst_id = "-1"
 
@@ -325,10 +324,6 @@ class TenantClient:
 ########################################
 
     def __get_descriptions(self):
-        
-        #params={"schema": self.schema, "tenant_id": self.model_id}
-        #response = self.api_client._TenantAPI__run_get("/episteme-svcs/api/descriptions", params=params)
-        #return response.json()
 
         tenant_config = self.get_tenant_config()
         descriptions = get_genie_descriptions(self.model_id, tenant_config, self.schema)

{kobai_sdk-0.3.3rc1.dist-info → kobai_sdk-0.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kobai-sdk
-Version: 0.3.3rc1
+Version: 0.3.4
 Summary: A package that enables interaction with a Kobai tenant.
 Author-email: Ryan Oattes <ryan@kobai.io>
 License:                                  Apache License
@@ -221,8 +221,8 @@ Requires-Dist: azure-identity
 Requires-Dist: azure-storage-blob
 Requires-Dist: langchain-core
 Requires-Dist: langchain-community
-Requires-Dist: langchain_openai
-Requires-Dist: databricks_langchain
+Requires-Dist: langchain-classic
+Requires-Dist: delta-spark
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: bumpver; extra == "dev"

kobai_sdk-0.3.4.dist-info/RECORD

@@ -0,0 +1,15 @@
+kobai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+kobai/ai_query.py,sha256=FnXn2pabJpXfTUcJvieVkAgMAjSTH9u5SFR9SJUJ-Lk,9556
+kobai/ai_rag.py,sha256=ZBUlpjbQC73yTXNV91uG_Tw-PvtWR5bSAg2NlwJQZwM,14635
+kobai/databricks_client.py,sha256=fyqqMly2Qm0r1AHWsQjkYeNsDdH0G1JSgTkF9KJ55qA,2118
+kobai/demo_tenant_client.py,sha256=wlNc-bdI2wotRXo8ppUOalv4hYdBlek_WzJNARZV-AE,9293
+kobai/genie.py,sha256=-EbEYpu9xj_3zIXaPdwbNJEAmoeM7nb9qK-h1f_STtM,8061
+kobai/ms_authenticate.py,sha256=rlmhtvAaSRBlYmvIBy5epMVa4MBGBLPaMwawu1T_xDQ,2252
+kobai/spark_client.py,sha256=opM_F-4Ut5Hq5zZjWMuLvUps9sDULvyPNZHXGL8dW1k,776
+kobai/tenant_api.py,sha256=Q5yuFd9_V4lo3LWzvYEEO3LpDRWFgQD4TlRPXDTGbiE,4368
+kobai/tenant_client.py,sha256=xozM69_e4Z8mD20JpPuVWVU5oOsRVazEjFRbcwV7p6s,38899
+kobai_sdk-0.3.4.dist-info/licenses/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+kobai_sdk-0.3.4.dist-info/METADATA,sha256=3HL7I8WqGfUJE26ZbK6XkUyJ3R93TOc38Kxj-kyOCgM,19861
+kobai_sdk-0.3.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+kobai_sdk-0.3.4.dist-info/top_level.txt,sha256=ns1El3BrTTHKvoAgU1XtiSaVIudYeCXbEEUVY8HFDZ4,6
+kobai_sdk-0.3.4.dist-info/RECORD,,

kobai_sdk-0.3.3rc1.dist-info/RECORD

@@ -1,15 +0,0 @@
-kobai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kobai/ai_query.py,sha256=FnXn2pabJpXfTUcJvieVkAgMAjSTH9u5SFR9SJUJ-Lk,9556
-kobai/ai_rag.py,sha256=XUq_SnJw17P53Zk75hHJgTryGjHEAyYPwC0r2WtuNp4,14627
-kobai/databricks_client.py,sha256=fyqqMly2Qm0r1AHWsQjkYeNsDdH0G1JSgTkF9KJ55qA,2118
-kobai/demo_tenant_client.py,sha256=wlNc-bdI2wotRXo8ppUOalv4hYdBlek_WzJNARZV-AE,9293
-kobai/genie.py,sha256=L78QQPnAYHk3SRXPdmrGpkG52jwCO2aG4r0esWdt3Ng,9102
-kobai/ms_authenticate.py,sha256=rlmhtvAaSRBlYmvIBy5epMVa4MBGBLPaMwawu1T_xDQ,2252
-kobai/spark_client.py,sha256=opM_F-4Ut5Hq5zZjWMuLvUps9sDULvyPNZHXGL8dW1k,776
-kobai/tenant_api.py,sha256=Q5yuFd9_V4lo3LWzvYEEO3LpDRWFgQD4TlRPXDTGbiE,4368
-kobai/tenant_client.py,sha256=Feu8786FFAUhIenLxBWRqWWrrdENzf0t35an95M1nSA,39023
-kobai_sdk-0.3.3rc1.dist-info/licenses/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-kobai_sdk-0.3.3rc1.dist-info/METADATA,sha256=KC2TQJd94mdxebpMTs8Jq-XrJaHQvBJxTYiJ4wQRAIQ,19872
-kobai_sdk-0.3.3rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-kobai_sdk-0.3.3rc1.dist-info/top_level.txt,sha256=ns1El3BrTTHKvoAgU1XtiSaVIudYeCXbEEUVY8HFDZ4,6
-kobai_sdk-0.3.3rc1.dist-info/RECORD,,