Updated Gaffer version to 2.3.0

src/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.2.2"
+__version__ = "2.3.0"
 
 __title__ = "gafferpy"
 __description__ = "Gaffer Python Shell"

src/fishbowl/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.2.2"
+__version__ = "2.3.0"
 
 __title__ = "fishbowl"
 __description__ = "Gaffer Python Shell"

src/gafferpy/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.2.2"
+__version__ = "2.3.0"
 
 __title__ = "gafferpy"
 __description__ = "Gaffer Python Shell"

src/gafferpy/generated_api/binaryoperators.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2022-2024 Crown Copyright
+# Copyright 2022 Crown Copyright
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 """
 
 import typing
-from gafferpy.gaffer_core import AbstractBinaryOperator, BinaryOperator, Function
+from gafferpy.gaffer_core import AbstractBinaryOperator,BinaryOperator,Function
 
 
 class RoaringBitmapAggregator(AbstractBinaryOperator):

src/gafferpy/generated_api/functions.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2022-2024 Crown Copyright
+# Copyright 2022 Crown Copyright
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 """
 
 import typing
-from gafferpy.gaffer_core import AbstractFunction, BinaryOperator, Function, Predicate
+from gafferpy.gaffer_core import AbstractFunction,BinaryOperator,Function,Predicate
 
 
 class ElementTransformer(AbstractFunction):
@@ -925,6 +925,56 @@ def to_json(self):
         return function_json
 
 
+class GafferEdgeGenerator(AbstractFunction):
+    CLASS = "uk.gov.gchq.gaffer.tinkerpop.generator.GafferEdgeGenerator"
+
+    def __init__(self):
+        super().__init__(_class_name=self.CLASS)
+
+    def to_json(self):
+        return super().to_json()
+
+
+class GafferEntityGenerator(AbstractFunction):
+    CLASS = "uk.gov.gchq.gaffer.tinkerpop.generator.GafferEntityGenerator"
+
+    def __init__(self):
+        super().__init__(_class_name=self.CLASS)
+
+    def to_json(self):
+        return super().to_json()
+
+
+class GafferPopEdgeGenerator(AbstractFunction):
+    CLASS = "uk.gov.gchq.gaffer.tinkerpop.generator.GafferPopEdgeGenerator"
+
+    def __init__(self):
+        super().__init__(_class_name=self.CLASS)
+
+    def to_json(self):
+        return super().to_json()
+
+
+class GafferPopElementGenerator(AbstractFunction):
+    CLASS = "uk.gov.gchq.gaffer.tinkerpop.generator.GafferPopElementGenerator"
+
+    def __init__(self):
+        super().__init__(_class_name=self.CLASS)
+
+    def to_json(self):
+        return super().to_json()
+
+
+class GafferPopVertexGenerator(AbstractFunction):
+    CLASS = "uk.gov.gchq.gaffer.tinkerpop.generator.GafferPopVertexGenerator"
+
+    def __init__(self):
+        super().__init__(_class_name=self.CLASS)
+
+    def to_json(self):
+        return super().to_json()
+
+
 class FreqMapExtractor(AbstractFunction):
     CLASS = "uk.gov.gchq.gaffer.types.function.FreqMapExtractor"
 

src/gafferpy/generated_api/operations.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2022-2024 Crown Copyright
+# Copyright 2022 Crown Copyright
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -20,10 +20,10 @@
 """
 
 import typing
-from gafferpy.gaffer_operations import AggregatePair, Conditional, Operation, View
-from gafferpy.gaffer_core import BinaryOperator, Element, ElementSeed, Function
+from gafferpy.gaffer_operations import AggregatePair,Conditional,Operation,View
+from gafferpy.gaffer_core import BinaryOperator,Element,ElementSeed,Function
 from gafferpy.gaffer_predicates import ElementFilter
-from gafferpy.gaffer_functions import CsvGenerator, ElementTransformer, MapGenerator
+from gafferpy.gaffer_functions import CsvGenerator,ElementTransformer,MapGenerator
 
 
 class ImportAccumuloKeyValueFiles(Operation):
@@ -215,6 +215,7 @@ class GetElementsWithinSet(Operation):
     Args:
         input:
         view:
+        include_incoming_out_going: Should the edges point towards, or away from your seeds
         directed_type: Is the Edge directed?
         views:
         options: Additional map of options
@@ -227,6 +228,7 @@ def __init__(
         self,
         input: typing.Optional[typing.List[typing.Any]] = None,
         view: typing.Optional[View] = None,
+        include_incoming_out_going: typing.Optional[str] = None,
         directed_type: typing.Optional[str] = None,
         views: typing.Optional[typing.List[View]] = None,
         options: typing.Optional[typing.Dict[str, str]] = None
@@ -235,6 +237,7 @@ def __init__(
         super().__init__(_class_name=self.CLASS, options=options)
         self.input = input
         self.view = view
+        self.include_incoming_out_going = include_incoming_out_going
         self.directed_type = directed_type
         self.views = views
 
@@ -244,6 +247,8 @@ def to_json(self):
             operation_json["input"] = self.input
         if self.view is not None:
             operation_json["view"] = self.view
+        if self.include_incoming_out_going is not None:
+            operation_json["includeIncomingOutGoing"] = self.include_incoming_out_going
         if self.directed_type is not None:
             operation_json["directedType"] = self.directed_type
         if self.views is not None:
@@ -2384,6 +2389,44 @@ def to_json(self):
         return operation_json
 
 
+class DeleteElements(Operation):
+    """
+    Deletes elements
+
+    Args:
+        input:
+        skip_invalid_elements:
+        validate:
+        options: Additional map of options
+    Returns:
+        java.lang.Void
+    """
+    CLASS = "uk.gov.gchq.gaffer.operation.impl.delete.DeleteElements"
+
+    def __init__(
+        self,
+        input: typing.Optional[typing.List[Element]] = None,
+        skip_invalid_elements: typing.Optional[bool] = None,
+        validate: typing.Optional[bool] = None,
+        options: typing.Optional[typing.Dict[str, str]] = None
+    ):
+
+        super().__init__(_class_name=self.CLASS, options=options)
+        self.input = input
+        self.skip_invalid_elements = skip_invalid_elements
+        self.validate = validate
+
+    def to_json(self):
+        operation_json = super().to_json()
+        if self.input is not None:
+            operation_json["input"] = self.input
+        if self.skip_invalid_elements is not None:
+            operation_json["skipInvalidElements"] = self.skip_invalid_elements
+        if self.validate is not None:
+            operation_json["validate"] = self.validate
+        return operation_json
+
+
 class GetExports(Operation):
     """
     Fetches multiple exports

src/gafferpy/generated_api/predicates.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2022-2024 Crown Copyright
+# Copyright 2022 Crown Copyright
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 """
 
 import typing
-from gafferpy.gaffer_core import AbstractPredicate, Function, Predicate
+from gafferpy.gaffer_core import AbstractPredicate,Function,Predicate
 from gafferpy.gaffer_functions import ElementTransformer
 
 

src/gafferpy_examples/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.2.2"
+__version__ = "2.3.0"
 
 __title__ = "gafferpy_examples"
 __description__ = "Gaffer Python Shell"