From 06f1453c5f2b37b63bdcc1cbc51c6ecc7ba059f4 Mon Sep 17 00:00:00 2001 From: Ryan Lubke Date: Fri, 28 Mar 2025 09:50:03 -0700 Subject: [PATCH 1/3] Replace Coherence 24.09 references with 25.03. --- .github/workflows/validate-nslookup.yml | 2 +- .github/workflows/validate.yml | 4 ++-- README.md | 4 ++-- docs/api_reference/ai.rst | 2 +- docs/caches.rst | 2 +- src/coherence/ai.py | 26 ++++++++++++------------- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/validate-nslookup.yml b/.github/workflows/validate-nslookup.yml index a072c81..a53f275 100644 --- a/.github/workflows/validate-nslookup.yml +++ b/.github/workflows/validate-nslookup.yml @@ -21,7 +21,7 @@ jobs: poetry-version: ["1.8.4"] os: [ubuntu-latest] coherenceVersion: - - 24.09.3 + - 25.03 - 22.06.11 base-image: - gcr.io/distroless/java17-debian11 diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 33d7d8d..0489893 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -21,7 +21,7 @@ jobs: poetry-version: ["1.8.4"] os: [ubuntu-latest] coherenceVersion: - - 24.09.3 + - 25.03 - 22.06.11 base-image: - gcr.io/distroless/java17-debian11 @@ -29,7 +29,7 @@ jobs: - ",-jakarta,javax" - ",jakarta,-javax" exclude: - - coherenceVersion: 24.09.3 + - coherenceVersion: 25.03 profile: ",-jakarta,javax" - coherenceVersion: 22.06.11 profile: ",jakarta,-javax" diff --git a/README.md b/README.md index dec6398..688ce66 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ The Coherence Python Client allows Python applications to act as cache clients t #### Requirements * [Coherence CE](https://github.com/oracle/coherence) 22.06.11+ or Coherence 14.1.1.2206.11+, 14.1.2.0+ Commercial edition with a configured [gRPCProxy](https://docs.oracle.com/en/middleware/standalone/coherence/14.1.1.2206/develop-remote-clients/using-coherence-grpc-server.html). -* Usage of module `coherence.ai` requires [Coherence CE](https://github.com/oracle/coherence) 24.09.2+ +* Usage of module `coherence.ai` requires [Coherence CE](https://github.com/oracle/coherence) 25.03+ * Python 3.9.x or later @@ -32,7 +32,7 @@ For local development, we recommend using the Coherence CE Docker image; it cont everything necessary for the client to operate correctly. ```bash -docker run -d -p 1408:1408 ghcr.io/oracle/coherence-ce:24.09.3 +docker run -d -p 1408:1408 ghcr.io/oracle/coherence-ce:25.03 ``` ## Installation diff --git a/docs/api_reference/ai.rst b/docs/api_reference/ai.rst index d516a43..82d50a3 100644 --- a/docs/api_reference/ai.rst +++ b/docs/api_reference/ai.rst @@ -4,7 +4,7 @@ https://oss.oracle.com/licenses/upl. ======================================= -coherence.ai [24.09.2+ server required] +coherence.ai [25.03+ server required] ======================================= .. toctree:: :maxdepth: 4 diff --git a/docs/caches.rst b/docs/caches.rst index 856beef..fe7af56 100644 --- a/docs/caches.rst +++ b/docs/caches.rst @@ -41,7 +41,7 @@ ensures updates made to, or removal of, an entry are properly reflected thus ensuring stale data isn't mistakenly returned. .. note:: - Near caching will only work with Coherence CE `24.09` or later. Attempting + Near caching will only work with Coherence CE `25.03` or later. Attempting to use near caching features with older versions will have no effect. A near cache is configured via `NearCacheOptions` which provides several diff --git a/src/coherence/ai.py b/src/coherence/ai.py index f06888f..b89ae83 100644 --- a/src/coherence/ai.py +++ b/src/coherence/ai.py @@ -27,7 +27,7 @@ class Vector(ABC): """ Base class that represents a Vector. - **NOTE:** This requires using Coherence CE 24.09.2+ on the server side. + **NOTE:** This requires using Coherence CE 25.03+ on the server side. """ def __init__(self) -> None: @@ -42,7 +42,7 @@ class BitVector(Vector): """ Class that represents a Vector of Bits. - **NOTE:** This requires using Coherence CE 24.09.2+ on the server side. + **NOTE:** This requires using Coherence CE 25.03+ on the server side. """ def __init__( @@ -78,7 +78,7 @@ class ByteVector(Vector): """ Class that represents Vector of bytes. - **NOTE:** This requires using Coherence CE 24.09.2+ on the server side. + **NOTE:** This requires using Coherence CE 25.03+ on the server side. """ def __init__(self, byte_array: bytes): @@ -96,7 +96,7 @@ class FloatVector(Vector): """ Class that represents Vector of floats. - **NOTE:** This requires using Coherence CE 24.09.2+ on the server side. + **NOTE:** This requires using Coherence CE 25.03+ on the server side. """ def __init__(self, float_array: List[float]): @@ -120,7 +120,7 @@ class DocumentChunk(AbstractEvolvable): """ Class that represents a chunk of text extracted from a document. - **NOTE:** This requires using Coherence CE 24.09.2+ on the server side. + **NOTE:** This requires using Coherence CE 25.03+ on the server side. """ def __init__( @@ -194,7 +194,7 @@ class DistanceAlgorithm(ABC): """ Base class that represents algorithm that can calculate distance to a given vector. - **NOTE:** This requires using Coherence CE 24.09.2+ on the server side. + **NOTE:** This requires using Coherence CE 25.03+ on the server side. """ def __init__(self) -> None: @@ -211,7 +211,7 @@ class CosineDistance(DistanceAlgorithm): roughly the same direction. It is often used to measure document similarity in text analysis. - **NOTE:** This requires using Coherence CE 24.09.2+ on the server side. + **NOTE:** This requires using Coherence CE 25.03+ on the server side. """ def __init__(self) -> None: @@ -224,7 +224,7 @@ class InnerProductDistance(DistanceAlgorithm): Represents a DistanceAlgorithm that performs inner product distance calculation between two vectors. - **NOTE:** This requires using Coherence CE 24.09.2+ on the server side. + **NOTE:** This requires using Coherence CE 25.03+ on the server side. """ def __init__(self) -> None: @@ -237,7 +237,7 @@ class L2SquaredDistance(DistanceAlgorithm): Represents a DistanceAlgorithm that performs an L2 squared distance calculation between two vectors. - **NOTE:** This requires using Coherence CE 24.09.2+ on the server side. + **NOTE:** This requires using Coherence CE 25.03+ on the server side. """ def __init__(self) -> None: @@ -249,7 +249,7 @@ class SimilaritySearch(EntryAggregator): """ This class represents an aggregator to execute a similarity query. - **NOTE:** This requires using Coherence CE 24.09.2+ on the server side. + **NOTE:** This requires using Coherence CE 25.03+ on the server side. """ def __init__( @@ -286,7 +286,7 @@ class BaseQueryResult(ABC): """ A base class for QueryResult implementation. - **NOTE:** This requires using Coherence CE 24.09.2+ on the server side. + **NOTE:** This requires using Coherence CE 25.03+ on the server side. """ def __init__(self, result: float, key: K, value: V) -> None: @@ -300,7 +300,7 @@ class QueryResult(BaseQueryResult): """ QueryResult class. - **NOTE:** This requires using Coherence CE 24.09.2+ on the server side. + **NOTE:** This requires using Coherence CE 25.03+ on the server side. """ def __init__(self, result: float, key: K, value: V) -> None: @@ -322,7 +322,7 @@ class BinaryQuantIndex(AbstractEvolvable): """ This class represents a custom index using binary quantization of vectors. - **NOTE:** This requires using Coherence CE 24.09.2+ on the server side. + **NOTE:** This requires using Coherence CE 25.03+ on the server side. """ def __init__(self, extractor: Union[ValueExtractor[T, E], str], over_sampling_factor: int = 3) -> None: From 394e57ee57bb1b6fc70d6849e6951d9eaf83af88 Mon Sep 17 00:00:00 2001 From: Ryan Lubke Date: Fri, 28 Mar 2025 10:04:21 -0700 Subject: [PATCH 2/3] Replace Coherence 24.09 references with 25.03. --- docs/api_reference/ai.rst | 2 +- src/coherence/ai.py | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/api_reference/ai.rst b/docs/api_reference/ai.rst index 82d50a3..d516a43 100644 --- a/docs/api_reference/ai.rst +++ b/docs/api_reference/ai.rst @@ -4,7 +4,7 @@ https://oss.oracle.com/licenses/upl. ======================================= -coherence.ai [25.03+ server required] +coherence.ai [24.09.2+ server required] ======================================= .. toctree:: :maxdepth: 4 diff --git a/src/coherence/ai.py b/src/coherence/ai.py index b89ae83..f06888f 100644 --- a/src/coherence/ai.py +++ b/src/coherence/ai.py @@ -27,7 +27,7 @@ class Vector(ABC): """ Base class that represents a Vector. - **NOTE:** This requires using Coherence CE 25.03+ on the server side. + **NOTE:** This requires using Coherence CE 24.09.2+ on the server side. """ def __init__(self) -> None: @@ -42,7 +42,7 @@ class BitVector(Vector): """ Class that represents a Vector of Bits. - **NOTE:** This requires using Coherence CE 25.03+ on the server side. + **NOTE:** This requires using Coherence CE 24.09.2+ on the server side. """ def __init__( @@ -78,7 +78,7 @@ class ByteVector(Vector): """ Class that represents Vector of bytes. - **NOTE:** This requires using Coherence CE 25.03+ on the server side. + **NOTE:** This requires using Coherence CE 24.09.2+ on the server side. """ def __init__(self, byte_array: bytes): @@ -96,7 +96,7 @@ class FloatVector(Vector): """ Class that represents Vector of floats. - **NOTE:** This requires using Coherence CE 25.03+ on the server side. + **NOTE:** This requires using Coherence CE 24.09.2+ on the server side. """ def __init__(self, float_array: List[float]): @@ -120,7 +120,7 @@ class DocumentChunk(AbstractEvolvable): """ Class that represents a chunk of text extracted from a document. - **NOTE:** This requires using Coherence CE 25.03+ on the server side. + **NOTE:** This requires using Coherence CE 24.09.2+ on the server side. """ def __init__( @@ -194,7 +194,7 @@ class DistanceAlgorithm(ABC): """ Base class that represents algorithm that can calculate distance to a given vector. - **NOTE:** This requires using Coherence CE 25.03+ on the server side. + **NOTE:** This requires using Coherence CE 24.09.2+ on the server side. """ def __init__(self) -> None: @@ -211,7 +211,7 @@ class CosineDistance(DistanceAlgorithm): roughly the same direction. It is often used to measure document similarity in text analysis. - **NOTE:** This requires using Coherence CE 25.03+ on the server side. + **NOTE:** This requires using Coherence CE 24.09.2+ on the server side. """ def __init__(self) -> None: @@ -224,7 +224,7 @@ class InnerProductDistance(DistanceAlgorithm): Represents a DistanceAlgorithm that performs inner product distance calculation between two vectors. - **NOTE:** This requires using Coherence CE 25.03+ on the server side. + **NOTE:** This requires using Coherence CE 24.09.2+ on the server side. """ def __init__(self) -> None: @@ -237,7 +237,7 @@ class L2SquaredDistance(DistanceAlgorithm): Represents a DistanceAlgorithm that performs an L2 squared distance calculation between two vectors. - **NOTE:** This requires using Coherence CE 25.03+ on the server side. + **NOTE:** This requires using Coherence CE 24.09.2+ on the server side. """ def __init__(self) -> None: @@ -249,7 +249,7 @@ class SimilaritySearch(EntryAggregator): """ This class represents an aggregator to execute a similarity query. - **NOTE:** This requires using Coherence CE 25.03+ on the server side. + **NOTE:** This requires using Coherence CE 24.09.2+ on the server side. """ def __init__( @@ -286,7 +286,7 @@ class BaseQueryResult(ABC): """ A base class for QueryResult implementation. - **NOTE:** This requires using Coherence CE 25.03+ on the server side. + **NOTE:** This requires using Coherence CE 24.09.2+ on the server side. """ def __init__(self, result: float, key: K, value: V) -> None: @@ -300,7 +300,7 @@ class QueryResult(BaseQueryResult): """ QueryResult class. - **NOTE:** This requires using Coherence CE 25.03+ on the server side. + **NOTE:** This requires using Coherence CE 24.09.2+ on the server side. """ def __init__(self, result: float, key: K, value: V) -> None: @@ -322,7 +322,7 @@ class BinaryQuantIndex(AbstractEvolvable): """ This class represents a custom index using binary quantization of vectors. - **NOTE:** This requires using Coherence CE 25.03+ on the server side. + **NOTE:** This requires using Coherence CE 24.09.2+ on the server side. """ def __init__(self, extractor: Union[ValueExtractor[T, E], str], over_sampling_factor: int = 3) -> None: From 90237e64c232b39b5491e4d31316cc8aeb1ae692 Mon Sep 17 00:00:00 2001 From: Ryan Lubke Date: Fri, 28 Mar 2025 10:05:53 -0700 Subject: [PATCH 3/3] Replace Coherence 24.09 references with 25.03. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 688ce66..d9dd00c 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ The Coherence Python Client allows Python applications to act as cache clients t #### Requirements * [Coherence CE](https://github.com/oracle/coherence) 22.06.11+ or Coherence 14.1.1.2206.11+, 14.1.2.0+ Commercial edition with a configured [gRPCProxy](https://docs.oracle.com/en/middleware/standalone/coherence/14.1.1.2206/develop-remote-clients/using-coherence-grpc-server.html). -* Usage of module `coherence.ai` requires [Coherence CE](https://github.com/oracle/coherence) 25.03+ +* Usage of module `coherence.ai` requires [Coherence CE](https://github.com/oracle/coherence) 24.09.2+ * Python 3.9.x or later