Skip to content
This repository has been archived by the owner on Oct 16, 2023. It is now read-only.

Gh 981: integrate fishbowl into gafferpy #1015

Merged
merged 36 commits into from
Aug 16, 2022

Conversation

t92549
Copy link
Contributor

@t92549 t92549 commented Jul 26, 2022

@codecov-commenter
Copy link

codecov-commenter commented Jul 26, 2022

Codecov Report

❗ No coverage uploaded for pull request base (v2-alpha@45f5fd1). Click here to learn what that means.
The diff coverage is n/a.

❗ Current head 41bb86c differs from pull request most recent head 5bb622e. Consider uploading reports for the commit 5bb622e to get more accurate results

Impacted file tree graph

@@             Coverage Diff             @@
##             v2-alpha    #1015   +/-   ##
===========================================
  Coverage            ?   45.15%           
  Complexity          ?      101           
===========================================
  Files               ?       25           
  Lines               ?      897           
  Branches            ?       73           
===========================================
  Hits                ?      405           
  Misses              ?      462           
  Partials            ?       30           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 45f5fd1...5bb622e. Read the comment docs.


return operation
class GetElementsWithinSet(GetElementsWithinSet):
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The GitHub diff makes these difficult to read, but at the bottom of this file here, when you see a Class overriding itself, it is because some extra helper functionality has been manually added to the generated class to retain backwards compatibility.
In this example, we are wrapping any non-list input into a list, then wrapping plain vertices in EntitySeeds.

Perhaps some patterns (like an input of seeds) could be added directly to the generating code in fishbowl to eliminate the need for as many manual additions. As well as cleaning this class up, it would mean when users generate their own versions of gafferpy, they get to keep these extensions without needing to extend directly from this file.

Copy link
Member

@GCHQDeveloper314 GCHQDeveloper314 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I notice a few files where the copyright has been updated even though there were no changes. I think this happens because the file is moved. Might be worth looking into separately.

python-shell/src/fishbowl/README.md Outdated Show resolved Hide resolved
python-shell/src/gafferpy/gaffer_config.py Show resolved Hide resolved
python-shell/src/gafferpy_examples/__init__.py Outdated Show resolved Hide resolved
@@ -5475,10 +5474,6 @@ def test_get_walks_correct_op(self):
self.assertEqual(g.GetWalks(
operations=[g.GetElements()]), expected_output_json)

def test_get_walks_incorrect_op(self):
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The incorrect get_walks tests have been removed as the error will now come directly from the Gaffer api (500) rather than throwing first in Python.

Copy link
Contributor

@t11947 t11947 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left some comments which may require changes/additions

python-shell/src/generate.py Show resolved Hide resolved
python-shell/src/gafferpy_examples/__init__.py Outdated Show resolved Hide resolved
python-shell/src/generate.py Show resolved Hide resolved
python-shell/src/test/test_connector.py Show resolved Hide resolved
@t92549 t92549 merged commit 1831d46 into v2-alpha Aug 16, 2022
@t92549 t92549 deleted the gh-981-gafferpy-fishbowl-maintain branch August 16, 2022 11:30
@t92549 t92549 linked an issue Aug 16, 2022 that may be closed by this pull request
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Generate gafferpy core api using fishbowl
4 participants