diff --git a/docs/source/conf.py b/docs/source/conf.py index 9b3f3df1..2266d585 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -22,7 +22,7 @@ author = "GCHQ" # The full version, including alpha/beta/rc tags -release = "2.3.1" +release = "2.3.2" # -- General configuration --------------------------------------------------- diff --git a/src/__init__.py b/src/__init__.py index 94f5a385..e0b0ce1a 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -1,4 +1,4 @@ -__version__ = "2.3.1" +__version__ = "2.3.2" __title__ = "gafferpy" __description__ = "Gaffer Python Shell" diff --git a/src/fishbowl/__init__.py b/src/fishbowl/__init__.py index 9124b59d..06a9d8de 100644 --- a/src/fishbowl/__init__.py +++ b/src/fishbowl/__init__.py @@ -1,4 +1,4 @@ -__version__ = "2.3.1" +__version__ = "2.3.2" __title__ = "fishbowl" __description__ = "Gaffer Python Shell" diff --git a/src/gafferpy/__init__.py b/src/gafferpy/__init__.py index 94f5a385..e0b0ce1a 100644 --- a/src/gafferpy/__init__.py +++ b/src/gafferpy/__init__.py @@ -1,4 +1,4 @@ -__version__ = "2.3.1" +__version__ = "2.3.2" __title__ = "gafferpy" __description__ = "Gaffer Python Shell" diff --git a/src/gafferpy/generated_api/binaryoperators.py b/src/gafferpy/generated_api/binaryoperators.py index f8040b75..bc3290c3 100644 --- a/src/gafferpy/generated_api/binaryoperators.py +++ b/src/gafferpy/generated_api/binaryoperators.py @@ -1,5 +1,5 @@ # -# Copyright 2022-2024 Crown Copyright +# Copyright 2022-2025 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the 'License'); # you may not use this file except in compliance with the License. @@ -444,6 +444,16 @@ def to_json(self): return super().to_json() +class IterableMerge(AbstractBinaryOperator): + CLASS = "uk.gov.gchq.koryphe.impl.binaryoperator.IterableMerge" + + def __init__(self): + super().__init__(_class_name=self.CLASS) + + def to_json(self): + return super().to_json() + + class Last(AbstractBinaryOperator): CLASS = "uk.gov.gchq.koryphe.impl.binaryoperator.Last" diff --git a/src/gafferpy/generated_api/functions.py b/src/gafferpy/generated_api/functions.py index 1d0c5b85..17b67cb9 100644 --- a/src/gafferpy/generated_api/functions.py +++ b/src/gafferpy/generated_api/functions.py @@ -1,5 +1,5 @@ # -# Copyright 2022-2024 Crown Copyright +# Copyright 2022-2025 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the 'License'); # you may not use this file except in compliance with the License. diff --git a/src/gafferpy/generated_api/operations.py b/src/gafferpy/generated_api/operations.py index ff6e0633..a1a942fa 100644 --- a/src/gafferpy/generated_api/operations.py +++ b/src/gafferpy/generated_api/operations.py @@ -1,5 +1,5 @@ # -# Copyright 2022-2024 Crown Copyright +# Copyright 2022-2025 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the 'License'); # you may not use this file except in compliance with the License. @@ -367,6 +367,59 @@ def to_json(self): return operation_json +class ChangeGraphAccess(Operation): + """ + Changes the access controls on a Graph + + Args: + owner: + public: + is_public: + write_predicate: + graph_id: + read_predicate: + options: Additional map of options + Returns: + java.lang.Void + """ + CLASS = "uk.gov.gchq.gaffer.federated.simple.operation.ChangeGraphAccess" + + def __init__( + self, + owner: typing.Optional[str] = None, + public: typing.Optional[typing.Any] = None, + is_public: typing.Optional[bool] = None, + write_predicate: typing.Optional[typing.Any] = None, + graph_id: typing.Optional[str] = None, + read_predicate: typing.Optional[typing.Any] = None, + options: typing.Optional[typing.Dict[str, str]] = None + ): + + super().__init__(_class_name=self.CLASS, options=options) + self.owner = owner + self.public = public + self.is_public = is_public + self.write_predicate = write_predicate + self.graph_id = graph_id + self.read_predicate = read_predicate + + def to_json(self): + operation_json = super().to_json() + if self.owner is not None: + operation_json["owner"] = self.owner + if self.public is not None: + operation_json["public"] = self.public + if self.is_public is not None: + operation_json["isPublic"] = self.is_public + if self.write_predicate is not None: + operation_json["writePredicate"] = self.write_predicate + if self.graph_id is not None: + operation_json["graphId"] = self.graph_id + if self.read_predicate is not None: + operation_json["readPredicate"] = self.read_predicate + return operation_json + + class ChangeGraphId(Operation): """ Changes Graph ID @@ -2572,7 +2625,7 @@ class DeleteElements(Operation): validate: options: Additional map of options Returns: - java.lang.Void + java.lang.Long """ CLASS = "uk.gov.gchq.gaffer.operation.impl.delete.DeleteElements" diff --git a/src/gafferpy/generated_api/predicates.py b/src/gafferpy/generated_api/predicates.py index 4f13c5cf..b5b30e12 100644 --- a/src/gafferpy/generated_api/predicates.py +++ b/src/gafferpy/generated_api/predicates.py @@ -1,5 +1,5 @@ # -# Copyright 2022-2024 Crown Copyright +# Copyright 2022-2025 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the 'License'); # you may not use this file except in compliance with the License. diff --git a/src/gafferpy_examples/__init__.py b/src/gafferpy_examples/__init__.py index 11cf88e5..d320578d 100644 --- a/src/gafferpy_examples/__init__.py +++ b/src/gafferpy_examples/__init__.py @@ -1,4 +1,4 @@ -__version__ = "2.3.1" +__version__ = "2.3.2" __title__ = "gafferpy_examples" __description__ = "Gaffer Python Shell" diff --git a/tests/__init__.py b/tests/__init__.py index af6e96ae..8e012209 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,4 +1,4 @@ -__version__ = "2.3.1" +__version__ = "2.3.2" __title__ = "gafferpy" __description__ = "Gaffer Python Shell" diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py index af6e96ae..8e012209 100644 --- a/tests/integration/__init__.py +++ b/tests/integration/__init__.py @@ -1,4 +1,4 @@ -__version__ = "2.3.1" +__version__ = "2.3.2" __title__ = "gafferpy" __description__ = "Gaffer Python Shell" diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py index af6e96ae..8e012209 100644 --- a/tests/unit/__init__.py +++ b/tests/unit/__init__.py @@ -1,4 +1,4 @@ -__version__ = "2.3.1" +__version__ = "2.3.2" __title__ = "gafferpy" __description__ = "Gaffer Python Shell"