Merge branch 'main' into patch-2

run-llama · Oct 9, 2024 · d447598 · d447598
2 parents fcd067b + 886e690
commit d447598
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/...ations/graph_stores/llama-index-graph-stores-neo4j/llama_index/graph_stores/neo4j/base.py b/...ations/graph_stores/llama-index-graph-stores-neo4j/llama_index/graph_stores/neo4j/base.py
@@ -253,7 +253,7 @@ def query(self, query: str, param_map: Optional[Dict[str, Any]] = None) -> Any:
         param_map = param_map or {}
         try:
             data, _, _ = self._driver.execute_query(
-                query, database=self._database, parameters_=param_map
+                query, database_=self._database, parameters_=param_map
             )
             return [r.data() for r in data]
         except neo4j.exceptions.Neo4jError as e:
@@ -276,6 +276,6 @@ def query(self, query: str, param_map: Optional[Dict[str, Any]] = None) -> Any:
             ):
                 raise
         # Fallback to allow implicit transactions
-        with self._driver.session() as session:
+        with self._driver.session(database=self._database) as session:
             data = session.run(neo4j.Query(text=query), param_map)
             return [r.data() for r in data]
diff --git a/...res/llama-index-graph-stores-neo4j/llama_index/graph_stores/neo4j/neo4j_property_graph.py b/...res/llama-index-graph-stores-neo4j/llama_index/graph_stores/neo4j/neo4j_property_graph.py
@@ -586,7 +586,7 @@ def structured_query(
         param_map = param_map or {}
         try:
             data, _, _ = self._driver.execute_query(
-                query, database=self._database, parameters_=param_map
+                query, database_=self._database, parameters_=param_map
             )
             full_result = [d.data() for d in data]
 
@@ -613,7 +613,7 @@ def structured_query(
             ):
                 raise
         # Fallback to allow implicit transactions
-        with self._driver.session() as session:
+        with self._driver.session(database=self._database) as session:
             data = session.run(neo4j.Query(text=query), param_map)
             full_result = [d.data() for d in data]
 

diff --git a/llama-index-integrations/graph_stores/llama-index-graph-stores-neo4j/pyproject.toml b/llama-index-integrations/graph_stores/llama-index-graph-stores-neo4j/pyproject.toml
@@ -28,7 +28,7 @@ exclude = ["**/BUILD"]
 license = "MIT"
 name = "llama-index-graph-stores-neo4j"
 readme = "README.md"
-version = "0.3.2"
+version = "0.3.3"
 
 [tool.poetry.dependencies]
 python = ">=3.8.1,<4.0"

diff --git a/llama-index-integrations/llms/llama-index-llms-openai/llama_index/llms/openai/utils.py b/llama-index-integrations/llms/llama-index-llms-openai/llama_index/llms/openai/utils.py
@@ -54,6 +54,8 @@
     "gpt-4o": 128000,
     "gpt-4o-2024-05-13": 128000,
     "gpt-4o-2024-08-06": 128000,
+    # Intended for research and evaluation
+    "chatgpt-4o-latest": 128000,
     "gpt-4o-mini": 128000,
     "gpt-4o-mini-2024-07-18": 128000,
     # 0613 models (function calling):

diff --git a/llama-index-integrations/llms/llama-index-llms-openai/pyproject.toml b/llama-index-integrations/llms/llama-index-llms-openai/pyproject.toml
@@ -29,7 +29,7 @@ exclude = ["**/BUILD"]
 license = "MIT"
 name = "llama-index-llms-openai"
 readme = "README.md"
-version = "0.2.12"
+version = "0.2.13"
 
 [tool.poetry.dependencies]
 python = ">=3.8.1,<4.0"

diff --git a/...tores/llama-index-vector-stores-neo4jvector/llama_index/vector_stores/neo4jvector/base.py b/...tores/llama-index-vector-stores-neo4jvector/llama_index/vector_stores/neo4jvector/base.py
@@ -442,7 +442,7 @@ def database_query(
         params = params or {}
         try:
             data, _, _ = self._driver.execute_query(
-                query, database=self._database, parameters_=params
+                query, database_=self._database, parameters_=params
             )
             return [r.data() for r in data]
         except neo4j.exceptions.Neo4jError as e:
@@ -465,7 +465,7 @@ def database_query(
             ):
                 raise
         # Fallback to allow implicit transactions
-        with self._driver.session() as session:
+        with self._driver.session(database=self._database) as session:
             data = session.run(neo4j.Query(text=query), params)
             return [r.data() for r in data]
 

diff --git a/llama-index-integrations/vector_stores/llama-index-vector-stores-neo4jvector/pyproject.toml b/llama-index-integrations/vector_stores/llama-index-vector-stores-neo4jvector/pyproject.toml
@@ -27,7 +27,7 @@ exclude = ["**/BUILD"]
 license = "MIT"
 name = "llama-index-vector-stores-neo4jvector"
 readme = "README.md"
-version = "0.2.2"
+version = "0.2.3"
 
 [tool.poetry.dependencies]
 python = ">=3.8.1,<4.0"