From e1ea94253397a41049aff4b5a8d717f74e7d51da Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 5 Jan 2024 16:35:02 +0000 Subject: [PATCH] Updated Gaffer version to 2.1.0 (#37) * Updated Gaffer version to 2.1.0 * Update binaryoperators.py * Update config.py * Update functions.py * Update operations.py * Update predicates.py --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: GCHQDeveloper314 <94527357+GCHQDeveloper314@users.noreply.github.com> --- docs/source/conf.py | 2 +- src/__init__.py | 2 +- src/fishbowl/__init__.py | 2 +- src/gafferpy/__init__.py | 2 +- src/gafferpy/generated_api/binaryoperators.py | 2 +- src/gafferpy/generated_api/config.py | 17 ++++++++++++++++- src/gafferpy/generated_api/functions.py | 18 +----------------- src/gafferpy/generated_api/operations.py | 2 +- src/gafferpy/generated_api/predicates.py | 2 +- src/gafferpy_examples/__init__.py | 2 +- 10 files changed, 25 insertions(+), 26 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 6d996cb1..328ea649 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.0.0' +release = '2.1.0' # -- General configuration --------------------------------------------------- diff --git a/src/__init__.py b/src/__init__.py index d04722b9..bfb202ab 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -1,4 +1,4 @@ -__version__ = "2.0.0" +__version__ = "2.1.0" __title__ = "gafferpy" __description__ = "Gaffer Python Shell" diff --git a/src/fishbowl/__init__.py b/src/fishbowl/__init__.py index 4757cd70..afc48abb 100644 --- a/src/fishbowl/__init__.py +++ b/src/fishbowl/__init__.py @@ -1,4 +1,4 @@ -__version__ = "2.0.0" +__version__ = "2.1.0" __title__ = "fishbowl" __description__ = "Gaffer Python Shell" diff --git a/src/gafferpy/__init__.py b/src/gafferpy/__init__.py index d04722b9..bfb202ab 100644 --- a/src/gafferpy/__init__.py +++ b/src/gafferpy/__init__.py @@ -1,4 +1,4 @@ -__version__ = "2.0.0" +__version__ = "2.1.0" __title__ = "gafferpy" __description__ = "Gaffer Python Shell" diff --git a/src/gafferpy/generated_api/binaryoperators.py b/src/gafferpy/generated_api/binaryoperators.py index 25cf37c5..2eb7cd79 100644 --- a/src/gafferpy/generated_api/binaryoperators.py +++ b/src/gafferpy/generated_api/binaryoperators.py @@ -1,5 +1,5 @@ # -# Copyright 2023 Crown Copyright +# Copyright 2022-2024 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/config.py b/src/gafferpy/generated_api/config.py index a7307834..01629b7d 100644 --- a/src/gafferpy/generated_api/config.py +++ b/src/gafferpy/generated_api/config.py @@ -1,5 +1,5 @@ # -# Copyright 2023 Crown Copyright +# Copyright 2022-2024 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the 'License'); # you may not use this file except in compliance with the License. @@ -27,6 +27,11 @@ def __init__(self): super().__init__("/graph/jobs") +class GetVersion(GetGraph): + def __init__(self): + super().__init__("/graph/version") + + class GetStatus(GetGraph): def __init__(self): super().__init__("/graph/status") @@ -62,6 +67,11 @@ def __init__(self): super().__init__("/graph/operations/details/all") +class GetOperationsAll(GetGraph): + def __init__(self): + super().__init__("/graph/operations/all") + + class GetJobs(GetGraph): def __init__(self, id=""): super().__init__(f"/graph/jobs/{id}") @@ -77,6 +87,11 @@ def __init__(self): super().__init__("/graph/config/transformFunctions") +class GetStoreType(GetGraph): + def __init__(self): + super().__init__("/graph/config/storeType") + + class GetStoreTraits(GetGraph): def __init__(self): super().__init__("/graph/config/storeTraits") diff --git a/src/gafferpy/generated_api/functions.py b/src/gafferpy/generated_api/functions.py index 99e0904d..d4ff6acf 100644 --- a/src/gafferpy/generated_api/functions.py +++ b/src/gafferpy/generated_api/functions.py @@ -1,5 +1,5 @@ # -# Copyright 2023 Crown Copyright +# Copyright 2022-2024 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the 'License'); # you may not use this file except in compliance with the License. @@ -606,7 +606,6 @@ class HyperLogLogPlusEntityGenerator(AbstractFunction): def __init__( self, properties_to_copy: typing.Optional[typing.List[str]] = None, - to_sketch_function: typing.Optional[typing.Any] = None, count_property: typing.Optional[str] = None, cardinality_property_name: typing.Optional[str] = None, edge_group_property: typing.Optional[str] = None, @@ -615,7 +614,6 @@ def __init__( ): super().__init__(_class_name=self.CLASS) self.properties_to_copy = properties_to_copy - self.to_sketch_function = to_sketch_function self.count_property = count_property self.cardinality_property_name = cardinality_property_name self.edge_group_property = edge_group_property @@ -626,8 +624,6 @@ def to_json(self): function_json = super().to_json() if self.properties_to_copy is not None: function_json["propertiesToCopy"] = self.properties_to_copy - if self.to_sketch_function is not None: - function_json["toSketchFunction"] = self.to_sketch_function if self.count_property is not None: function_json["countProperty"] = self.count_property if self.cardinality_property_name is not None: @@ -689,7 +685,6 @@ class HllSketchEntityGenerator(AbstractFunction): def __init__( self, properties_to_copy: typing.Optional[typing.List[str]] = None, - to_sketch_function: typing.Optional[typing.Any] = None, count_property: typing.Optional[str] = None, cardinality_property_name: typing.Optional[str] = None, edge_group_property: typing.Optional[str] = None, @@ -698,7 +693,6 @@ def __init__( ): super().__init__(_class_name=self.CLASS) self.properties_to_copy = properties_to_copy - self.to_sketch_function = to_sketch_function self.count_property = count_property self.cardinality_property_name = cardinality_property_name self.edge_group_property = edge_group_property @@ -709,8 +703,6 @@ def to_json(self): function_json = super().to_json() if self.properties_to_copy is not None: function_json["propertiesToCopy"] = self.properties_to_copy - if self.to_sketch_function is not None: - function_json["toSketchFunction"] = self.to_sketch_function if self.count_property is not None: function_json["countProperty"] = self.count_property if self.cardinality_property_name is not None: @@ -730,18 +722,14 @@ class IterableToHllSketch(AbstractFunction): def __init__( self, log_k: typing.Optional[int] = None, - hll_sketch: typing.Optional[typing.Any] = None, ): super().__init__(_class_name=self.CLASS) self.log_k = log_k - self.hll_sketch = hll_sketch def to_json(self): function_json = super().to_json() if self.log_k is not None: function_json["logK"] = self.log_k - if self.hll_sketch is not None: - function_json["hllSketch"] = self.hll_sketch return function_json @@ -751,18 +739,14 @@ class ToHllSketch(AbstractFunction): def __init__( self, log_k: typing.Optional[int] = None, - hll_sketch: typing.Optional[typing.Any] = None, ): super().__init__(_class_name=self.CLASS) self.log_k = log_k - self.hll_sketch = hll_sketch def to_json(self): function_json = super().to_json() if self.log_k is not None: function_json["logK"] = self.log_k - if self.hll_sketch is not None: - function_json["hllSketch"] = self.hll_sketch return function_json diff --git a/src/gafferpy/generated_api/operations.py b/src/gafferpy/generated_api/operations.py index 3a7b4584..0e104a79 100644 --- a/src/gafferpy/generated_api/operations.py +++ b/src/gafferpy/generated_api/operations.py @@ -1,5 +1,5 @@ # -# Copyright 2023 Crown Copyright +# Copyright 2022-2024 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/predicates.py b/src/gafferpy/generated_api/predicates.py index 090eb52b..4f13c5cf 100644 --- a/src/gafferpy/generated_api/predicates.py +++ b/src/gafferpy/generated_api/predicates.py @@ -1,5 +1,5 @@ # -# Copyright 2023 Crown Copyright +# Copyright 2022-2024 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 4e1dab15..e067ce2a 100644 --- a/src/gafferpy_examples/__init__.py +++ b/src/gafferpy_examples/__init__.py @@ -1,4 +1,4 @@ -__version__ = "2.0.0" +__version__ = "2.1.0" __title__ = "gafferpy_examples" __description__ = "Gaffer Python Shell"