Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gh-38: Updated Gaffer version to 2.1.0 #37

Merged
merged 6 commits into from
Jan 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
author = 'GCHQ'

# The full version, including alpha/beta/rc tags
release = '2.0.0'
release = '2.1.0'


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "2.0.0"
__version__ = "2.1.0"

__title__ = "gafferpy"
__description__ = "Gaffer Python Shell"
Expand Down
2 changes: 1 addition & 1 deletion src/fishbowl/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "2.0.0"
__version__ = "2.1.0"

__title__ = "fishbowl"
__description__ = "Gaffer Python Shell"
Expand Down
2 changes: 1 addition & 1 deletion src/gafferpy/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "2.0.0"
__version__ = "2.1.0"

__title__ = "gafferpy"
__description__ = "Gaffer Python Shell"
Expand Down
2 changes: 1 addition & 1 deletion src/gafferpy/generated_api/binaryoperators.py
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
17 changes: 16 additions & 1 deletion src/gafferpy/generated_api/config.py
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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}")
Expand All @@ -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")
Expand Down
18 changes: 1 addition & 17 deletions src/gafferpy/generated_api/functions.py
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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,
Expand All @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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,
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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


Expand All @@ -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


Expand Down
2 changes: 1 addition & 1 deletion src/gafferpy/generated_api/operations.py
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/gafferpy/generated_api/predicates.py
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/gafferpy_examples/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "2.0.0"
__version__ = "2.1.0"

__title__ = "gafferpy_examples"
__description__ = "Gaffer Python Shell"
Expand Down
Loading