From fb171274d03687489876d579515d078efc6f3982 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 11:39:13 +0000 Subject: [PATCH 1/4] :arrow_up: Bump fastapi from 0.109.2 to 0.115.6 Bumps [fastapi](https://github.com/fastapi/fastapi) from 0.109.2 to 0.115.6. - [Release notes](https://github.com/fastapi/fastapi/releases) - [Commits](https://github.com/fastapi/fastapi/compare/0.109.2...0.115.6) --- updated-dependencies: - dependency-name: fastapi dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- poetry.lock | 19 ++++++++++--------- pyproject.toml | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/poetry.lock b/poetry.lock index bc3f19ec5..87117fa3c 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1593,22 +1593,23 @@ redis = ">=5.0.1,<6.0.0" [[package]] name = "fastapi" -version = "0.109.2" +version = "0.115.6" description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production" optional = false python-versions = ">=3.8" files = [ - {file = "fastapi-0.109.2-py3-none-any.whl", hash = "sha256:2c9bab24667293b501cad8dd388c05240c850b58ec5876ee3283c47d6e1e3a4d"}, - {file = "fastapi-0.109.2.tar.gz", hash = "sha256:f3817eac96fe4f65a2ebb4baa000f394e55f5fccdaf7f75250804bc58f354f73"}, + {file = "fastapi-0.115.6-py3-none-any.whl", hash = "sha256:e9240b29e36fa8f4bb7290316988e90c381e5092e0cbe84e7818cc3713bcf305"}, + {file = "fastapi-0.115.6.tar.gz", hash = "sha256:9ec46f7addc14ea472958a96aae5b5de65f39721a46aaf5705c480d9a8b76654"}, ] [package.dependencies] pydantic = ">=1.7.4,<1.8 || >1.8,<1.8.1 || >1.8.1,<2.0.0 || >2.0.0,<2.0.1 || >2.0.1,<2.1.0 || >2.1.0,<3.0.0" -starlette = ">=0.36.3,<0.37.0" +starlette = ">=0.40.0,<0.42.0" typing-extensions = ">=4.8.0" [package.extras] -all = ["email-validator (>=2.0.0)", "httpx (>=0.23.0)", "itsdangerous (>=1.1.0)", "jinja2 (>=2.11.2)", "orjson (>=3.2.1)", "pydantic-extra-types (>=2.0.0)", "pydantic-settings (>=2.0.0)", "python-multipart (>=0.0.7)", "pyyaml (>=5.3.1)", "ujson (>=4.0.1,!=4.0.2,!=4.1.0,!=4.2.0,!=4.3.0,!=5.0.0,!=5.1.0)", "uvicorn[standard] (>=0.12.0)"] +all = ["email-validator (>=2.0.0)", "fastapi-cli[standard] (>=0.0.5)", "httpx (>=0.23.0)", "itsdangerous (>=1.1.0)", "jinja2 (>=2.11.2)", "orjson (>=3.2.1)", "pydantic-extra-types (>=2.0.0)", "pydantic-settings (>=2.0.0)", "python-multipart (>=0.0.7)", "pyyaml (>=5.3.1)", "ujson (>=4.0.1,!=4.0.2,!=4.1.0,!=4.2.0,!=4.3.0,!=5.0.0,!=5.1.0)", "uvicorn[standard] (>=0.12.0)"] +standard = ["email-validator (>=2.0.0)", "fastapi-cli[standard] (>=0.0.5)", "httpx (>=0.23.0)", "jinja2 (>=2.11.2)", "python-multipart (>=0.0.7)", "uvicorn[standard] (>=0.12.0)"] [[package]] name = "fastapi-users" @@ -7552,13 +7553,13 @@ tests = ["cython", "littleutils", "pygments", "pytest", "typeguard"] [[package]] name = "starlette" -version = "0.36.3" +version = "0.41.3" description = "The little ASGI library that shines." optional = false python-versions = ">=3.8" files = [ - {file = "starlette-0.36.3-py3-none-any.whl", hash = "sha256:13d429aa93a61dc40bf503e8c801db1f1bca3dc706b10ef2434a36123568f044"}, - {file = "starlette-0.36.3.tar.gz", hash = "sha256:90a671733cfb35771d8cc605e0b679d23b992f8dcfad48cc60b38cb29aeb7080"}, + {file = "starlette-0.41.3-py3-none-any.whl", hash = "sha256:44cedb2b7c77a9de33a8b74b2b90e9f50d11fcf25d8270ea525ad71a25374ff7"}, + {file = "starlette-0.41.3.tar.gz", hash = "sha256:0e4ab3d16522a255be6b28260b938eae2482f98ce5cc934cb08dce8dc3ba5835"}, ] [package.dependencies] @@ -8871,4 +8872,4 @@ weaviate = ["weaviate-client"] [metadata] lock-version = "2.0" python-versions = ">=3.9.0,<3.12" -content-hash = "18d78e556471b4b63c948138233ef4b38bba02f649a469180c2b1c292f0d61df" +content-hash = "11a43b99fb231db46cb07d72cb19b6ffde1a263862122c3f53e759b618ce18b7" diff --git a/pyproject.toml b/pyproject.toml index ad0f3683f..60cbca7fd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,7 @@ python = ">=3.9.0,<3.12" openai = "1.52.0" pydantic = "2.8.2" python-dotenv = "1.0.1" -fastapi = "^0.109.2" +fastapi = ">=0.109.2,<0.116.0" uvicorn = "0.22.0" requests = "2.32.3" aiohttp = "3.10.10" From 4811dd937564da23d3659516c57c46175f2ed930 Mon Sep 17 00:00:00 2001 From: Igor Ilic Date: Wed, 11 Dec 2024 17:20:14 +0100 Subject: [PATCH 2/4] fix: Resolve issue with test deduplication github action Remove calling unused get docs github action Fix --- .github/workflows/test_deduplication.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/test_deduplication.yml b/.github/workflows/test_deduplication.yml index 924aab130..315288f22 100644 --- a/.github/workflows/test_deduplication.yml +++ b/.github/workflows/test_deduplication.yml @@ -16,14 +16,8 @@ env: RUNTIME__LOG_LEVEL: ERROR jobs: - get_docs_changes: - name: docs changes - uses: ./.github/workflows/get_docs_changes.yml - run_deduplication_test: name: test - needs: get_docs_changes - if: needs.get_docs_changes.outputs.changes_outside_docs == 'true' && ${{ github.event.label.name == 'run-checks' }} runs-on: ubuntu-latest defaults: run: From c24df239eac4ff51d461f96c4c49247ef2e1d2ae Mon Sep 17 00:00:00 2001 From: Igor Ilic <30923996+dexters1@users.noreply.github.com> Date: Thu, 12 Dec 2024 11:01:47 +0100 Subject: [PATCH 3/4] fix: Resolve issue with UUID being concatinated instead of string (#357) Resolve issue regarding UUID being concatenated instead of string --- cognee/modules/graph/utils/retrieve_existing_edges.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cognee/modules/graph/utils/retrieve_existing_edges.py b/cognee/modules/graph/utils/retrieve_existing_edges.py index 50b5f3d7c..0959e79d8 100644 --- a/cognee/modules/graph/utils/retrieve_existing_edges.py +++ b/cognee/modules/graph/utils/retrieve_existing_edges.py @@ -53,6 +53,6 @@ async def retrieve_existing_edges( existing_edges_map = {} for edge in existing_edges: - existing_edges_map[edge[0] + edge[1] + edge[2]] = True + existing_edges_map[str(edge[0]) + str(edge[1]) + edge[2]] = True return existing_edges_map From aa46bb3d642d51b5431c373f2749d74d7a1b992f Mon Sep 17 00:00:00 2001 From: Boris Arzentar Date: Thu, 12 Dec 2024 12:46:26 +0100 Subject: [PATCH 4/4] fix: enable checks for dev --- .github/workflows/cd.yaml | 11 +++-------- .github/workflows/docker_compose.yml | 2 ++ .github/workflows/profiling.yaml | 5 ++++- .github/workflows/py_lint.yml | 5 +---- .github/workflows/test_deduplication.yml | 2 -- notebooks/cognee_code_graph_demo.ipynb | 4 ++-- 6 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 146ec4ed4..19b3d6cb3 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -3,7 +3,7 @@ name: publish dev | Docker image on: push: branches: - - main + - dev - feature/* paths-ignore: - '**.md' @@ -28,13 +28,8 @@ jobs: - name: Set environment variable for stage id: set-env run: | - if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then - echo "STAGE=prd" >> $GITHUB_ENV - echo "::set-output name=stage::prd" - else - echo "STAGE=dev" >> $GITHUB_ENV - echo "::set-output name=stage::dev" - fi + echo "STAGE=dev" >> $GITHUB_ENV + echo "::set-output name=stage::dev" - name: Use output run: echo "The stage is ${{ steps.set-env.outputs.stage }}" diff --git a/.github/workflows/docker_compose.yml b/.github/workflows/docker_compose.yml index 93b41e5af..657f0c8c6 100644 --- a/.github/workflows/docker_compose.yml +++ b/.github/workflows/docker_compose.yml @@ -4,9 +4,11 @@ on: push: branches: - main + - dev pull_request: branches: - main + - dev jobs: docker-compose-test: diff --git a/.github/workflows/profiling.yaml b/.github/workflows/profiling.yaml index 6ca09f9dc..93ed82f82 100644 --- a/.github/workflows/profiling.yaml +++ b/.github/workflows/profiling.yaml @@ -1,7 +1,10 @@ name: test | profiling on: - push + workflow_dispatch: + pull_request: + types: [labeled, synchronize] + jobs: profiler: runs-on: ubuntu-latest diff --git a/.github/workflows/py_lint.yml b/.github/workflows/py_lint.yml index 713b23624..dfdcdfd8f 100644 --- a/.github/workflows/py_lint.yml +++ b/.github/workflows/py_lint.yml @@ -2,11 +2,8 @@ name: lint | code & tests on: - pull_request: - branches: - - main - - devel workflow_dispatch: + pull_request: concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} diff --git a/.github/workflows/test_deduplication.yml b/.github/workflows/test_deduplication.yml index 924aab130..708fc9c9c 100644 --- a/.github/workflows/test_deduplication.yml +++ b/.github/workflows/test_deduplication.yml @@ -3,8 +3,6 @@ name: test | deduplication on: workflow_dispatch: pull_request: - branches: - - main types: [labeled, synchronize] diff --git a/notebooks/cognee_code_graph_demo.ipynb b/notebooks/cognee_code_graph_demo.ipynb index f5735dcb8..83c5a1d37 100644 --- a/notebooks/cognee_code_graph_demo.ipynb +++ b/notebooks/cognee_code_graph_demo.ipynb @@ -46,7 +46,7 @@ "import git\n", "\n", "notebook_path = path.abspath(\"\")\n", - "repo_clone_location = path.join(notebook_path, \"data/graphrag\")\n", + "repo_clone_location = path.join(notebook_path, \".data/graphrag\")\n", "\n", "LocalStorage.remove_all(repo_clone_location)\n", "\n", @@ -86,7 +86,7 @@ "from cognee.modules.pipelines import run_tasks\n", "\n", "notebook_path = os.path.abspath(\"\")\n", - "repo_clone_location = os.path.join(notebook_path, \"data/graphrag\")\n", + "repo_clone_location = os.path.join(notebook_path, \".data/graphrag\")\n", "\n", "pipeline = run_tasks(tasks, repo_clone_location, \"code_graph_pipeline\")\n", "\n",