Skip to content

Commit

Permalink
chore: Fix packaging (#38)
Browse files Browse the repository at this point in the history
* feat: Update project name and description

The project name and description in the `pyproject.toml` file have been updated to reflect the changes made to the project.

* chore: Update pyproject.toml to include core package

The `pyproject.toml` file has been updated to include the `core` package in the list of packages. This change ensures that the `core` package is included when building the project.

* fix imports

* fix importats
  • Loading branch information
danielchalef committed Aug 25, 2024
1 parent 0d2942d commit c5e5215
Show file tree
Hide file tree
Showing 37 changed files with 103 additions and 99 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ format:
# Lint code
lint:
$(RUFF) check
$(MYPY) ./core --show-column-numbers --show-error-codes --pretty
$(MYPY) ./graphiti_core --show-column-numbers --show-error-codes --pretty

# Run tests
test:
Expand Down
6 changes: 3 additions & 3 deletions examples/podcast/podcast_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
from dotenv import load_dotenv
from transcript_parser import parse_podcast_messages

from core import Graphiti
from core.utils.bulk_utils import BulkEpisode
from core.utils.maintenance.graph_data_operations import clear_data
from graphiti_core import Graphiti
from graphiti_core.utils.bulk_utils import BulkEpisode
from graphiti_core.utils.maintenance.graph_data_operations import clear_data

load_dotenv()

Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions core/edges.py → graphiti_core/edges.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
from neo4j import AsyncDriver
from pydantic import BaseModel, Field

from core.llm_client.config import EMBEDDING_DIM
from core.nodes import Node
from graphiti_core.llm_client.config import EMBEDDING_DIM
from graphiti_core.nodes import Node

logger = logging.getLogger(__name__)

Expand Down
22 changes: 11 additions & 11 deletions core/graphiti.py → graphiti_core/graphiti.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,36 +24,36 @@
from dotenv import load_dotenv
from neo4j import AsyncGraphDatabase

from core.edges import EntityEdge, EpisodicEdge
from core.llm_client import LLMClient, LLMConfig, OpenAIClient
from core.nodes import EntityNode, EpisodicNode
from core.search.search import SearchConfig, hybrid_search
from core.search.search_utils import (
from graphiti_core.edges import EntityEdge, EpisodicEdge
from graphiti_core.llm_client import LLMClient, LLMConfig, OpenAIClient
from graphiti_core.nodes import EntityNode, EpisodicNode
from graphiti_core.search.search import SearchConfig, hybrid_search
from graphiti_core.search.search_utils import (
get_relevant_edges,
get_relevant_nodes,
)
from core.utils import (
from graphiti_core.utils import (
build_episodic_edges,
retrieve_episodes,
)
from core.utils.bulk_utils import (
from graphiti_core.utils.bulk_utils import (
BulkEpisode,
dedupe_edges_bulk,
dedupe_nodes_bulk,
extract_nodes_and_edges_bulk,
resolve_edge_pointers,
retrieve_previous_episodes_bulk,
)
from core.utils.maintenance.edge_operations import (
from graphiti_core.utils.maintenance.edge_operations import (
dedupe_extracted_edges,
extract_edges,
)
from core.utils.maintenance.graph_data_operations import (
from graphiti_core.utils.maintenance.graph_data_operations import (
EPISODE_WINDOW_LEN,
build_indices_and_constraints,
)
from core.utils.maintenance.node_operations import dedupe_extracted_nodes, extract_nodes
from core.utils.maintenance.temporal_operations import (
from graphiti_core.utils.maintenance.node_operations import dedupe_extracted_nodes, extract_nodes
from graphiti_core.utils.maintenance.temporal_operations import (
extract_edge_dates,
invalidate_edges,
prepare_edges_for_invalidation,
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion core/nodes.py → graphiti_core/nodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
from openai import OpenAI
from pydantic import BaseModel, Field

from core.llm_client.config import EMBEDDING_DIM
from graphiti_core.llm_client.config import EMBEDDING_DIM

logger = logging.getLogger(__name__)

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
12 changes: 6 additions & 6 deletions core/search/search.py → graphiti_core/search/search.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@
from neo4j import AsyncDriver
from pydantic import BaseModel

from core.edges import EntityEdge
from core.llm_client.config import EMBEDDING_DIM
from core.nodes import EntityNode, EpisodicNode
from core.search.search_utils import (
from graphiti_core.edges import EntityEdge
from graphiti_core.llm_client.config import EMBEDDING_DIM
from graphiti_core.nodes import EntityNode, EpisodicNode
from graphiti_core.search.search_utils import (
edge_fulltext_search,
edge_similarity_search,
get_mentioned_nodes,
rrf,
)
from core.utils import retrieve_episodes
from core.utils.maintenance.graph_data_operations import EPISODE_WINDOW_LEN
from graphiti_core.utils import retrieve_episodes
from graphiti_core.utils.maintenance.graph_data_operations import EPISODE_WINDOW_LEN

logger = logging.getLogger(__name__)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
from neo4j import AsyncDriver
from neo4j import time as neo4j_time

from core.edges import EntityEdge
from core.nodes import EntityNode, EpisodicNode
from graphiti_core.edges import EntityEdge
from graphiti_core.nodes import EntityNode, EpisodicNode

logger = logging.getLogger(__name__)

Expand Down
File renamed without changes.
16 changes: 8 additions & 8 deletions core/utils/bulk_utils.py → graphiti_core/utils/bulk_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@
from numpy import dot
from pydantic import BaseModel

from core.edges import Edge, EntityEdge, EpisodicEdge
from core.llm_client import LLMClient
from core.nodes import EntityNode, EpisodicNode
from core.search.search_utils import get_relevant_edges, get_relevant_nodes
from core.utils import retrieve_episodes
from core.utils.maintenance.edge_operations import (
from graphiti_core.edges import Edge, EntityEdge, EpisodicEdge
from graphiti_core.llm_client import LLMClient
from graphiti_core.nodes import EntityNode, EpisodicNode
from graphiti_core.search.search_utils import get_relevant_edges, get_relevant_nodes
from graphiti_core.utils import retrieve_episodes
from graphiti_core.utils.maintenance.edge_operations import (
build_episodic_edges,
dedupe_edge_list,
dedupe_extracted_edges,
extract_edges,
)
from core.utils.maintenance.graph_data_operations import EPISODE_WINDOW_LEN
from core.utils.maintenance.node_operations import (
from graphiti_core.utils.maintenance.graph_data_operations import EPISODE_WINDOW_LEN
from graphiti_core.utils.maintenance.node_operations import (
dedupe_extracted_nodes,
dedupe_node_list,
extract_nodes,
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
from time import time
from typing import List

from core.edges import EntityEdge, EpisodicEdge
from core.llm_client import LLMClient
from core.nodes import EntityNode, EpisodicNode
from core.prompts import prompt_library
from graphiti_core.edges import EntityEdge, EpisodicEdge
from graphiti_core.llm_client import LLMClient
from graphiti_core.nodes import EntityNode, EpisodicNode
from graphiti_core.prompts import prompt_library

logger = logging.getLogger(__name__)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from neo4j import AsyncDriver
from typing_extensions import LiteralString

from core.nodes import EpisodicNode
from graphiti_core.nodes import EpisodicNode

EPISODE_WINDOW_LEN = 3

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
from datetime import datetime
from time import time

from core.llm_client import LLMClient
from core.nodes import EntityNode, EpisodicNode
from core.prompts import prompt_library
from graphiti_core.llm_client import LLMClient
from graphiti_core.nodes import EntityNode, EpisodicNode
from graphiti_core.prompts import prompt_library

logger = logging.getLogger(__name__)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
from datetime import datetime
from typing import List

from core.edges import EntityEdge
from core.llm_client import LLMClient
from core.nodes import EntityNode, EpisodicNode
from core.prompts import prompt_library
from graphiti_core.edges import EntityEdge
from graphiti_core.llm_client import LLMClient
from graphiti_core.nodes import EntityNode, EpisodicNode
from graphiti_core.prompts import prompt_library

logger = logging.getLogger(__name__)

Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions core/utils/utils.py → graphiti_core/utils/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

import logging

from core.edges import EpisodicEdge
from core.nodes import EntityNode, EpisodicNode
from graphiti_core.edges import EpisodicEdge
from graphiti_core.nodes import EntityNode, EpisodicNode

logger = logging.getLogger(__name__)

Expand Down
74 changes: 37 additions & 37 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
[tool.poetry]
name = "graphiti"
name = "graphiti-core"
version = "0.0.1"
description = "Graph building library"
description = "A temporal graph building library"
authors = [
"Paul Paliychuk <paul@getzep.com>",
"Preston Rasmussen <preston@getzep.com>",
]
readme = "README.md"
license = "Apache-2.0"

packages = [
{ include = "graphiti_core", from = "." }
]

[tool.poetry.dependencies]
python = "^3.10"
pydantic = "^2.8.2"
Expand Down
4 changes: 2 additions & 2 deletions runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

from dotenv import load_dotenv

from core import Graphiti
from core.utils.maintenance.graph_data_operations import clear_data
from graphiti_core import Graphiti
from graphiti_core.utils.maintenance.graph_data_operations import clear_data

load_dotenv()

Expand Down
6 changes: 3 additions & 3 deletions tests/tests_int_graphiti.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
from neo4j import AsyncGraphDatabase
from openai import OpenAI

from core.edges import EntityEdge, EpisodicEdge
from core.graphiti import Graphiti
from core.nodes import EntityNode, EpisodicNode
from graphiti_core.edges import EntityEdge, EpisodicEdge
from graphiti_core.graphiti import Graphiti
from graphiti_core.nodes import EntityNode, EpisodicNode

pytestmark = pytest.mark.integration

Expand Down
6 changes: 3 additions & 3 deletions tests/utils/maintenance/test_temporal_operations.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import pytest

from core.edges import EntityEdge
from core.nodes import EntityNode, EpisodicNode
from core.utils.maintenance.temporal_operations import (
from graphiti_core.edges import EntityEdge
from graphiti_core.nodes import EntityNode, EpisodicNode
from graphiti_core.utils.maintenance.temporal_operations import (
prepare_edges_for_invalidation,
prepare_invalidation_context,
)
Expand Down
Loading

0 comments on commit c5e5215

Please sign in to comment.