Cypher25 APOC proc func migration #4208

gem-neo4j · 2024-10-16T12:29:29Z

Migrating procedures to APOC for next major (from APOC core).

Note: This also

Fixes the build, so it works with latest unpublished Neo
Updates gradle
Fixes the kotlin
Updates some dependencies including testContainers which was the timeout bug

There is another PR to come with docs for this, but that one can't be merged until we get a new branch etc next year

…for testing

[lYfZxdRz] Deprecate and remove procedures/functions for Cypher 25 (#669)

vga91

Nice work! :)
Just 2 little suggestions and one question and it's OK

vga91 · 2024-10-25T12:20:44Z

docs/asciidoc/modules/ROOT/pages/ml/openai.adoc

@@ -18,7 +18,7 @@ All the following procedures can have the following APOC config, i.e. in `apoc.c
 | apoc.ml.openai.url | the OpenAI endpoint base url | `https://api.openai.com/v1` by default, 
    `https://api.anthropic.com/v1` if `apoc.ml.openai.type=<ANTHROPIC>`,
    or empty string if `apoc.ml.openai.type=<AZURE OR HUGGINGFACE>`
-| apoc.ml.azure.api.version | in case of `apoc.ml.openai.type=AZURE`, indicates the `api-version` to be passed after the `?api-version=` url
+| apoc.ml.azure.api.version | in case of `apoc.ml.openai.type=AZURE`, indicates the `api-version` to be passed after the `?api-version=` url | 


Maybe I would add something like <empty string> or "" after the final |?

vga91 · 2024-10-25T12:24:24Z

extended-it/src/test/java/apoc/MissingExtraDependenciesTest.java

    private static void assertParquetFails(String query) {
        assertFails(query, PARQUET_MISSING_DEPS_ERROR);
    }


I think this method is not used anymore

vga91 · 2024-10-25T12:33:18Z

extended/src/test/java/apoc/log/Neo4jLogStreamTest.java

+        testResult(db, "CYPHER 25 CALL apoc.log.stream('debug.log')", res -> {
+            final String wholeFile =
+                    Iterators.stream(res.<String>columnAs("line")).collect(Collectors.joining(""));
+            assertTrue(wholeFile.contains("apoc.import.file.enabled=false"));


Just to understand how it works.

Would this test (and the others too) work without CYPHER 25?
And what is the difference between the test without the prefix?

They don't work without Cypher 25 at the moment because we haven't got Cypher Versions 100% done in Neo4j yet, but soon we want to be able to change the default version, and when the default version is Cypher 25, then the test wouldn't need the prefix. Basically, these moved procedures only exist on Cypher 25 and not Cypher 5 for extended, and they only exist on Cypher 5 and not 25 for Core :)

Ah ok, got it thanks :)

vga91

LGTM!

…dependency conflict errors (#4215) * Change Docker download based on branch name * change BRANCH_NAME var * rechange BRANCH_NAME var * added fi statement * added CODEARTIFACT_DOWNLOAD_URL if-else * added if CODEARTIFACT_DOWNLOAD_URL then teamcity-repository.gradle * removed -SNAPSHOT * Partially reverted 'Cypher25 APOC proc func migration (#4208)' * Revert "Provisionally ignored failing docker tests in 5.20 (#4085)" This reverts commit 05bb7ff. * try resetting ci.yaml * try with if-else * decommented BRANCH_NAME * code clean ci.yaml * changed extra deps to remove AbstractMethodError with hadoop deps * excluded deps from xls and hadoop * removed -community suffix from ci.yaml * Update CI.yaml * Update CI.yaml

…dependency conflict errors (neo4j-contrib#4215) * Change Docker download based on branch name * change BRANCH_NAME var * rechange BRANCH_NAME var * added fi statement * added CODEARTIFACT_DOWNLOAD_URL if-else * added if CODEARTIFACT_DOWNLOAD_URL then teamcity-repository.gradle * removed -SNAPSHOT * Partially reverted 'Cypher25 APOC proc func migration (neo4j-contrib#4208)' * Revert "Provisionally ignored failing docker tests in 5.20 (neo4j-contrib#4085)" This reverts commit 05bb7ff. * try resetting ci.yaml * try with if-else * decommented BRANCH_NAME * code clean ci.yaml * changed extra deps to remove AbstractMethodError with hadoop deps * excluded deps from xls and hadoop * removed -community suffix from ci.yaml * Update CI.yaml * Update CI.yaml

gem-neo4j added team-cypher-surface Cypher Surface team should review the PR dev labels Oct 16, 2024

gem-neo4j force-pushed the cypher25_apoc_proc_func_migration branch from 4ab3499 to e106f2c Compare October 17, 2024 06:08

[lYfZxdRz] Migrate procedures and functions from Core to Cypher 25

2587542

gem-neo4j force-pushed the cypher25_apoc_proc_func_migration branch 4 times, most recently from 8a39c12 to e31058e Compare October 17, 2024 06:39

[lYfZxdRz] Fix the build

c994a6a

gem-neo4j force-pushed the cypher25_apoc_proc_func_migration branch 2 times, most recently from 5aad47f to 114bc23 Compare October 17, 2024 08:53

[lYfZxdRz] APOC Core changes updates

9bae70b

gem-neo4j force-pushed the cypher25_apoc_proc_func_migration branch 2 times, most recently from fbcf1f5 to 0a2ae7a Compare October 17, 2024 10:02

[lYfZxdRz] Fixes

c732e92

gem-neo4j force-pushed the cypher25_apoc_proc_func_migration branch from 0a2ae7a to c732e92 Compare October 17, 2024 10:51

omar952 and others added 3 commits October 17, 2024 12:23

Updates to ensure latest nightly docker images from AWS ECR are used …

adbf9de

…for testing

Updating environment variable name from NEO4J_VERSION_CI to NEO4JVERSION

d7aa089

[lYfZxdRz] Fix the enterprise docker ref

cc42ebb

[lYfZxdRz] Deprecate and remove procedures/functions for Cypher 25 (#669)

gem-neo4j force-pushed the cypher25_apoc_proc_func_migration branch 2 times, most recently from b1b51d4 to 6ddece8 Compare October 18, 2024 11:20

Kotlin fix

d234960

gem-neo4j force-pushed the cypher25_apoc_proc_func_migration branch from 6ddece8 to d234960 Compare October 18, 2024 11:40

Parquet is now in Neo dependencies

e75b4fc

Lojjs assigned vga91 Oct 21, 2024

vga91 requested changes Oct 25, 2024

View reviewed changes

PR fixes

b72c4f8

vga91 approved these changes Oct 28, 2024

View reviewed changes

gem-neo4j merged commit 9121a81 into dev Oct 28, 2024
5 checks passed

gem-neo4j deleted the cypher25_apoc_proc_func_migration branch October 28, 2024 08:03

vga91 added a commit that referenced this pull request Nov 4, 2024

Partially reverted 'Cypher25 APOC proc func migration (#4208)'

c815734

vga91 added a commit that referenced this pull request Nov 4, 2024

Partially reverted 'Cypher25 APOC proc func migration (#4208)'

4d3d605

vga91 added a commit that referenced this pull request Nov 5, 2024

Partially reverted 'Cypher25 APOC proc func migration (#4208)'

3dcc58c

vga91 added a commit that referenced this pull request Nov 5, 2024

Partially reverted 'Cypher25 APOC proc func migration (#4208)'

d9030ee

vga91 added a commit that referenced this pull request Nov 5, 2024

Partially reverted 'Cypher25 APOC proc func migration (#4208)'

deb75e4

vga91 mentioned this pull request Nov 5, 2024

Change Docker download based on branch name and solved startup/extra-dependency conflict errors #4215

Merged

vga91 mentioned this pull request Nov 11, 2024

Fix ApocSignatures.PROCEDURES not found in StartupExtendedTest due to Cypher25 introduction #4225

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cypher25 APOC proc func migration #4208

Cypher25 APOC proc func migration #4208

gem-neo4j commented Oct 16, 2024 •

edited

Loading

vga91 left a comment

vga91 Oct 25, 2024

vga91 Oct 25, 2024

vga91 Oct 25, 2024

gem-neo4j Oct 25, 2024

vga91 Oct 28, 2024

vga91 left a comment

Cypher25 APOC proc func migration #4208

Cypher25 APOC proc func migration #4208

Conversation

gem-neo4j commented Oct 16, 2024 • edited Loading

vga91 left a comment

Choose a reason for hiding this comment

vga91 Oct 25, 2024

Choose a reason for hiding this comment

vga91 Oct 25, 2024

Choose a reason for hiding this comment

vga91 Oct 25, 2024

Choose a reason for hiding this comment

gem-neo4j Oct 25, 2024

Choose a reason for hiding this comment

vga91 Oct 28, 2024

Choose a reason for hiding this comment

vga91 left a comment

Choose a reason for hiding this comment

gem-neo4j commented Oct 16, 2024 •

edited

Loading