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

[develop < T0086-GA] Change arguments in RETURN method #146

Merged
merged 38 commits into from
Jun 6, 2022

Conversation

katarinasupe
Copy link
Contributor

@katarinasupe katarinasupe commented May 16, 2022

Description

I've changed arguments in RETURN, YIELD and WITHmethods in the query builder according to the discussion in one of the issues: #140. I created a new class called ResultPartialQuery from which ReturnPartialQuery, YieldPartialQuery and WithPartialQuery inherit.

Pull request type

  • Code style update (formatting, renaming)
  • Refactoring with functional or API changes

Related issues

Closes #140 and #125

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes

######################################

Reviewer checklist (the reviewer checks this part)

  • Core feature implementation
  • Tests
  • Code documentation
  • Documentation on memgraph/docs

######################################

@katarinasupe katarinasupe added the status: draft PR is in draft phase label May 16, 2022
@katarinasupe katarinasupe self-assigned this May 16, 2022
@katarinasupe katarinasupe linked an issue May 16, 2022 that may be closed by this pull request
@katarinasupe katarinasupe added status: ready PR is ready for review and removed status: draft PR is in draft phase labels May 17, 2022
@katarinasupe katarinasupe marked this pull request as ready for review May 17, 2022 07:26
@katarinasupe
Copy link
Contributor Author

As I mentioned in the PR description, I think that UNWIND, YIELD and WITH should be changed in the same way. If you agree, should I do that in this PR or in separate PRs? @g-despot @brunos252 @BorisTasevski @Josipmrden

gqlalchemy/query_builder.py Outdated Show resolved Hide resolved
gqlalchemy/exceptions.py Outdated Show resolved Hide resolved
gqlalchemy/exceptions.py Show resolved Hide resolved
gqlalchemy/query_builder.py Outdated Show resolved Hide resolved
gqlalchemy/query_builder.py Outdated Show resolved Hide resolved
gqlalchemy/query_builder.py Outdated Show resolved Hide resolved
gqlalchemy/query_builder.py Outdated Show resolved Hide resolved
katarinasupe and others added 13 commits May 17, 2022 14:03
…rated into edge query (#141)

* added base class and integrated into edge query

* on comments

* comment fixes

* Add minor docstring changes

* Reorder imports

* convert other @Property's to positive logic

* boris comments

* add pass to abstractmethod

* removed temp var use

Co-authored-by: Ivan Despot <ivan.g.despot@outlook.com>
* added base class and integrated into edge query

* added bfs class and tests

* rename to BreadthFirstSearch

* on comments

* on comments

* comment fixes

* mrma comments

* Add minor docstring changes

* Update memgraph.py

* boris comments

* flake8 fixes

Co-authored-by: Ivan Despot <ivan.g.despot@outlook.com>
* Introduced SET Clause support

* Implementation Done; Tests Added

* formatting

* minor formatting

* Removed templates

* unused imports removed

* unused imports removed

* Rename to SetOperator and add new tests

* Add query clause enum in exceptions

Co-authored-by: Boris Tasevski <boris.tasevski@memgraph.io>
Co-authored-by: katarinasupe <supe.katarina@gmail.com>
* added base class and integrated into edge query

* add dfs and tests

* on comments

* add bounds tests and (e, v) -> (r, n)

* comment fixes

* mrma comments

* blank line removal

* boris comments

* remove duplicate code

* duplicate code

* fix
* added base class and integrated into edge query

* added wShortest and tests

* on comments

* comment fixes

* mrma comments and refactoring

* another

* fix

* make upper bound str since the init
* Introduced SET Clause support

* Implementation Done; Tests Added

* formatting

* minor formatting

* Removed templates

* unused imports removed

* unused imports removed

* Rename to SetOperator and add new tests

* Add query clause enum in exceptions

Co-authored-by: Boris Tasevski <boris.tasevski@memgraph.io>
Co-authored-by: katarinasupe <supe.katarina@gmail.com>
* first draft

* stash changes 2

* finished parse_signature

* make it work, add docstrings

* formatting

* added tests +

* reorganize tests

* add mock test for get_procedures, to avoid needing MAGE

* startswith -> starts_with

* starts_with in docstring

* ok i will not edit in github again. starts_with in description

* refactor _parse_field

* added QB test, moved parser to utilities, Kate changes

* test fix

* refactor and comments from Mrma

* comments fixes

* finish merge lol
@katarinasupe katarinasupe linked an issue May 20, 2022 that may be closed by this pull request
@g-despot g-despot added status: draft PR is in draft phase and removed status: ready PR is ready for review labels May 26, 2022
@katarinasupe katarinasupe added status: ready PR is ready for review and removed status: draft PR is in draft phase labels May 26, 2022
katarinasupe and others added 14 commits May 27, 2022 09:39
* Rename edge to relationship; add kwargs in tests

* Fix test on docs

* [develop < TOO53-GA] Investigate Timeout error (#120)

* Update dependencies

* Increase Bolt session inactivity timeout

* Update workflow

* Update workflow

* Add config flag --also-log-to-stderr

* Catch Memgraph logs

* Catch Memgraph logs

* Update log level

* Upload log as artifact

* Add log file

* Create new log directory

* Run Action step even if error is thrown

* Change session nactivity timeout

* Change Ubuntu GitHub job

* Update Ubuntu GitHub job

* Update Ubuntu GitHub job

* Update Ubuntu GitHub job

* Update Ubuntu GitHub job

* Update GitHub action paths

* Update GitHub action paths

* Update GitHub action permissions

* Update GitHub action

* Update GitHub action

* Update GitHub action

* Update GitHub action

* Update GitHub action

* Update GitHub action

* [develop < T0070-GA] Add more clauses for base classes (#139)

* added load_csv, tests

* add return base class, change CSV to Csv

* black formatting

* Change edge in loaders

* Change labels_str -> type_str; edge_label-> relationship_type

Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>
Co-authored-by: Bruno Sačarić <bruno.sacaric@gmail.com>
* Add Field to models

* Remove Field from gqlalchemy init
…sNotFoundWarning (#121)

* Ignore warning in tests

* Set lazy loading to false

* Add codeowner
* Update bug_report.md

* [master <  T0068-GA] Update README (#136)

* Update README

* Fix broken link

* Move emojis

* Add table to title

* host and port read only

Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>
Co-authored-by: Katarina Supe <61758502+katarinasupe@users.noreply.github.com>
)

* added functionality and tests

* add docstring

* add test for relationship

* black

* migrated check to to_cypher_value

* community fixes

* change test names

* type checking

* renamed variable value to name
* Update bug_report.md

* [master <  T0068-GA] Update README (#136)

* Update README

* Fix broken link

* Move emojis

* Add table to title

* new connection private method

Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>
Co-authored-by: Katarina Supe <61758502+katarinasupe@users.noreply.github.com>
* Update bug_report.md

* [master <  T0068-GA] Update README (#136)

* Update README

* Fix broken link

* Move emojis

* Add table to title

* exceptions fixed

* fixed stream tests

* reformatting

* Update bug_report.md

* [master <  T0068-GA] Update README (#136)

* Update README

* Fix broken link

* Move emojis

* Add table to title

* exceptions fixed

* fixed stream tests

* reformatting

* rebased

* exceptions fixed

* reformatting

* renamed

* fixed

* Added new line

Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>
Co-authored-by: Katarina Supe <61758502+katarinasupe@users.noreply.github.com>
* Add datetime support

* Change value_type to value

* Add new tests

* Format timedelta and add datetime tests

* Add datetimeKwMapping and change call to one-liner

* Fix flake8

* Fix import formatting

Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>
* Update bug_report.md

* [master <  T0068-GA] Update README (#136)

* Update README

* Fix broken link

* Move emojis

* Add table to title

* changed string variables for Blob and S3 kwargs

Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>
Co-authored-by: Katarina Supe <61758502+katarinasupe@users.noreply.github.com>
@katarinasupe katarinasupe merged commit 8c84800 into develop Jun 6, 2022
@katarinasupe katarinasupe deleted the T0086-GA-change-return-arguments branch June 6, 2022 11:43
g-despot added a commit that referenced this pull request Jun 14, 2022
* add code documentation

* add receive and return types

* add python-markdown with docusaurus renderer

* add documentation for the query builder

* Update docs

* Fix formatting

* Add tests for docs

* Fix NodePartialQuery and Merge

* Add load node test

* Add node mapping test

* Remove description

* Minor fixes

* Add test for relationship mapping

* Add save relationship tests

* Add load tests

* Add testing without Field

* Fix formatting in node labels and properties

* Expose validator from pydantic

* Add pydantic validator test

* Refactor fixtures

* Add base and simple merge tests

* Remove space from trigger test

* Ignore test test_run_1000_queries

* Add test for constraints

* Add new fixture

* Add trigger ALL check, xor and constraint check

* Add unique and exists contraints getters

* Remove indices - not necessary

* Add test for index attribute

* Remove ensure indexes from fixture

* Add and, or, xor tests

* Add XOR and LOAD CSV to query builder and fix optional in Merge

* Refactor code

* Refactor tests

* Add execute option to query builder

* change tests

* Fix review comments

* Fix constraint tests

* Remove print()

* Replace execute_and_fetch with execute

* Add create trigger without ON

* Add simpler implementation

* bootstrap_servers argument usage

* property->item and removed spaces when it is label

* List[str] instead of List

* patch slight merge difference

* pymgclient back to 1.1.0

* poetry.lock revert to develop setting

* formatting correction

* revert pyproject.toml to develop

* revert poetry.lock to develop

* black formatting patch

* Update pymgclient and GQLAlchemy version

* Update pymgclient and GQLAlchemy version

* Change to load the whole streamer node

* Remove unnecessary test

* Add tests

* Add batch save methods

* Extend test

* Format code

* Fix save_node() method and add new test

* Test node & relationship objects in query builder

* Add tests for loading and properties

* property->item and removed spaces when it is label

* patch slight merge difference

* pymgclient back to 1.1.0

* poetry.lock revert to develop setting

* formatting correction

* Update pymgclient and GQLAlchemy version

* bootstrap_servers argument usage

* List[str] instead of List

* revert pyproject.toml to develop

* revert poetry.lock to develop

* Update pymgclient and GQLAlchemy version

* Add load node test

* Minor fixes

* Add testing without Field

* change tests

* Change to load the whole streamer node

* Remove unnecessary test

* Update

* Update tests

* Change 'property' to 'item' in xor_where

* Fix creating query with label

* Add tests for label filtering in where

* Update exception handling in test

* Remove where tests

* Fix if condition statement

* Remove unnecessary variable assignments

* [develop < T0040-GA] Add index on label (#113)

* Add new exception class for index on label

* Add index on label with tests

* Add new lines

* Add newlines again

* Change test according to docs

* Remove None from attrs.get

* [develop < T0020-GA] Fix label inheritance (#105)

* Research label behaviour

* Save parent class labels

* Fix black format

* Fix inheritance from multiple classes

* Remove prints

* Refactor code

* Reformat with black

* Skip set union if not necessary

* Replace if statement

* Refactor code

Co-authored-by: katarinasupe <supe.katarina@gmail.com>

* [develop < T0039-GA] Change where procedure in query builder (#111)

* Add new where methods and tests

* Fix other tests accordingly (4)

* Change error message check

* Add better error handling and fix tests

* Remove code duplication

* Fix docstring

* Add all docstrings

* Make build where private

* Refactor code

* Fix black and flake

* _build_where_query method updated

* formatting

Co-authored-by: Boris Tasevski <boris.tasevski@memgraph.io>

* [develop < T0035 - GA] Add table to graph importer (#100)

* initial implementation of loader/translator logic; No tests added

* query builder updated with two new functionalities; 1) Where Clause that compares two properties in database; 2) construct_query method that simply exposes _construct_query protected method

* major naming changes; minor code reorganization

* Blank spaces

* Minor naming changes; Initial documentation;

* code refactoring; introduced dacite

* Introduced mapping class; Template Trigger Query introduced; Save row as relationship rehauled

* Added drop all indexes and drop all triggers to memgraph; Trigger query creation is now static method

* parameter fix

* Minor Typing related changes

* remove unused import

* Format document

* Fixed Query Builder Where test

* Where clause additional fix

* import fix

* rename parameter; remove unnecessary typing

* Small bugfix; Minor refactoring

* drop database on start set to True in translate method

* docs update; format of dataset introduced. If omitted, defaults to parquet

Co-authored-by: Boris Tasevski <boris.tasevski@memgraph.io>

* [develop < T0046-GA] Add order by descending (#114)

* Add order_by_desc and test

* Fix DESC and add keyword in test

* Desc inherits from OrderBy

* Add new order_by

* Order By revamped

* Add type error and key arguments in tests

* Add missing quotes

* reduced line length under 80

* Remove trailing whitespaces

* Add query check before execution

* Where clause related classes rewritten

* order by related methods moved to OrderByPartialQuery class

* minor code fix

* Add where and order_by examples to docstrings

* Add NOT and fix tests

* Add docstring examples

* Remove blank lines after docstrings

Co-authored-by: Boris Tasevski <boris.tasevski@memgraph.io>

* [develop < T0001-GA] Memgraph instance runner (#91)

* Add initial instance runner

* Update instance_runner

* Update instance runner

* Update Docker runner

* Add Ubutnu runner

* Remove Ubuntu instance runner

* Remove prints

* Fix instance_runner test

* Fix binary test

* Fix step order in workflow

* Add sudo to test

* Skip some tests in Windows workflow

* Pull Docker image in Windows workflow

* Update Docker image in Windows workflow

* Update Docker image in Windows workflow

* Skip some tests in Windows workflow

* Remove Docker pull from Windows workflow

* Add more tests and fix Docker bug

* Refactor tests and binary runner

* Refactor code and add docstrings

* Fix docstring formatting

* Fix formatting

* Replace strings with constants

* Add tests and new method

* Add docker mark to test

* Add constants and formatting

* Add f strings

* Add exponential backoff

* Fix formatting

* Fix formatting

* Update connection retry delay time

* Add checklist and closes keyword (#127)

* [develop < T0023-GA]  Add Azure Blob and local storage importers (#104)

* initial implementation of loader/translator logic; No tests added

* query builder updated with two new functionalities; 1) Where Clause that compares two properties in database; 2) construct_query method that simply exposes _construct_query protected method

* major naming changes; minor code reorganization

* Blank spaces

* Blob datasource and importer

* Minor naming changes; Initial documentation;

* refactoring loaders.py

* Boris loaders

* code refactoring; introduced dacite

* boriss commit, added comments

* tiny fix

* removed doubling of where method

* Mrma; replaced filesystem_type str with enum, added ValueError output

* added enum for DataLoaders, extracted supported filetypes

* Update loaders.py

* returned Boris' query_builder code

* I am bad at git

* Introduced mapping class; Template Trigger Query introduced; Save row as relationship rehauled

* Added drop all indexes and drop all triggers to memgraph; Trigger query creation is now static method

* parameter fix

* Minor Typing related changes

* remove unused import

* Format document

* added custom importers + minor changes

* extracted some strings

* minor fix

* Fixed Query Builder Where test

* Where clause additional fix

* tests for importer

* tiny fixes

* Black formatting

* further black formatting

* workflows edit

* flake8 format

* reverted workflows

* indentation

* comment styling

* removed changes not by me

* added tests with other filetypes, bugfix

* add filetype examples

* merging bugfix

* dodao print-eve kako Boris zapoveda

* formatting for BLACK

* orc file not readable on Windows

* fix previous commit

* latest changes

* applied tests

* docstrings update

* poetry update

* revert poetry.lock

* one more

* revert version of pywin32

* Update docstrings

Co-authored-by: Boris Tasevski <boris.tasevski@memgraph.io>
Co-authored-by: Ivan Despot <ivan.g.despot@outlook.com>

* [develop < T0048-GA] Update and extend code documentation (#116)

* Update the query_builder documentation

* Update docs

* [develop < TOO53-GA] Investigate Timeout error (#120)

* Update dependencies

* Increase Bolt session inactivity timeout

* Update workflow

* Update workflow

* Add config flag --also-log-to-stderr

* Catch Memgraph logs

* Catch Memgraph logs

* Update log level

* Upload log as artifact

* Add log file

* Create new log directory

* Run Action step even if error is thrown

* Change session nactivity timeout

* Change Ubuntu GitHub job

* Update Ubuntu GitHub job

* Update Ubuntu GitHub job

* Update Ubuntu GitHub job

* Update Ubuntu GitHub job

* Update GitHub action paths

* Update GitHub action paths

* Update GitHub action permissions

* Update GitHub action

* Update GitHub action

* Update GitHub action

* Update GitHub action

* Update GitHub action

* Update GitHub action

* [develop < T0070-GA] Add more clauses for base classes (#139)

* added load_csv, tests

* add return base class, change CSV to Csv

* black formatting

* [develop < T0071-GA-bfs-and-shortest-path] added base class and integrated into edge query (#141)

* added base class and integrated into edge query

* on comments

* comment fixes

* Add minor docstring changes

* Reorder imports

* convert other @Property's to positive logic

* boris comments

* add pass to abstractmethod

* removed temp var use

Co-authored-by: Ivan Despot <ivan.g.despot@outlook.com>

* [T0071-GA < BFS] add bfs class and tests (#142)

* added base class and integrated into edge query

* added bfs class and tests

* rename to BreadthFirstSearch

* on comments

* on comments

* comment fixes

* mrma comments

* Add minor docstring changes

* Update memgraph.py

* boris comments

* flake8 fixes

Co-authored-by: Ivan Despot <ivan.g.despot@outlook.com>

* [develop < T0059-GA] Add SET method to the query builder (#128)

* Introduced SET Clause support

* Implementation Done; Tests Added

* formatting

* minor formatting

* Removed templates

* unused imports removed

* unused imports removed

* Rename to SetOperator and add new tests

* Add query clause enum in exceptions

Co-authored-by: Boris Tasevski <boris.tasevski@memgraph.io>
Co-authored-by: katarinasupe <supe.katarina@gmail.com>

* [T0071-GA < DFS] add dfs and tests (#144)

* added base class and integrated into edge query

* add dfs and tests

* on comments

* add bounds tests and (e, v) -> (r, n)

* comment fixes

* mrma comments

* blank line removal

* boris comments

* remove duplicate code

* duplicate code

* fix

* [T0071-GA < wShortest] added WeightedShortestPath and tests (#143)

* added base class and integrated into edge query

* added wShortest and tests

* on comments

* comment fixes

* mrma comments and refactoring

* another

* fix

* make upper bound str since the init

* [develop < T0026-GA] Wrap query modules (#130)

* first draft

* stash changes 2

* finished parse_signature

* make it work, add docstrings

* formatting

* added tests +

* reorganize tests

* add mock test for get_procedures, to avoid needing MAGE

* startswith -> starts_with

* starts_with in docstring

* ok i will not edit in github again. starts_with in description

* refactor _parse_field

* added QB test, moved parser to utilities, Kate changes

* test fix

* refactor and comments from Mrma

* comments fixes

* finish merge lol

* [develop < T0081-GA] Rename Edge to Relationship (#145)

* Rename edge to relationship; add kwargs in tests

* Fix test on docs

* [develop < TOO53-GA] Investigate Timeout error (#120)

* Update dependencies

* Increase Bolt session inactivity timeout

* Update workflow

* Update workflow

* Add config flag --also-log-to-stderr

* Catch Memgraph logs

* Catch Memgraph logs

* Update log level

* Upload log as artifact

* Add log file

* Create new log directory

* Run Action step even if error is thrown

* Change session nactivity timeout

* Change Ubuntu GitHub job

* Update Ubuntu GitHub job

* Update Ubuntu GitHub job

* Update Ubuntu GitHub job

* Update Ubuntu GitHub job

* Update GitHub action paths

* Update GitHub action paths

* Update GitHub action permissions

* Update GitHub action

* Update GitHub action

* Update GitHub action

* Update GitHub action

* Update GitHub action

* Update GitHub action

* [develop < T0070-GA] Add more clauses for base classes (#139)

* added load_csv, tests

* add return base class, change CSV to Csv

* black formatting

* Change edge in loaders

* Change labels_str -> type_str; edge_label-> relationship_type

Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>
Co-authored-by: Bruno Sačarić <bruno.sacaric@gmail.com>

* moved integrated algorithms (#147)

* [develop < T0034-GA] Add Field to models (#122)

* Add Field to models

* Remove Field from gqlalchemy init

* [develop < T0054-GA] Add option to suppress warning GQLAlchemySubclassNotFoundWarning (#121)

* Ignore warning in tests

* Set lazy loading to false

* Add codeowner

* host and port read only (#156)

* Update bug_report.md

* [master <  T0068-GA] Update README (#136)

* Update README

* Fix broken link

* Move emojis

* Add table to title

* host and port read only

Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>
Co-authored-by: Katarina Supe <61758502+katarinasupe@users.noreply.github.com>

* [develop < T0094-GA] Variable support for node and edge properties (#154)

* added functionality and tests

* add docstring

* add test for relationship

* black

* migrated check to to_cypher_value

* community fixes

* change test names

* type checking

* renamed variable value to name

* new connection private method (#157)

* Update bug_report.md

* [master <  T0068-GA] Update README (#136)

* Update README

* Fix broken link

* Move emojis

* Add table to title

* new connection private method

Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>
Co-authored-by: Katarina Supe <61758502+katarinasupe@users.noreply.github.com>

* [develop < T0074-GA] Remove sudo from instance_runner (#148)

* Remove sudo

* Remove unused import

* exceptions fixed (#153)

* Update bug_report.md

* [master <  T0068-GA] Update README (#136)

* Update README

* Fix broken link

* Move emojis

* Add table to title

* exceptions fixed

* fixed stream tests

* reformatting

* Update bug_report.md

* [master <  T0068-GA] Update README (#136)

* Update README

* Fix broken link

* Move emojis

* Add table to title

* exceptions fixed

* fixed stream tests

* reformatting

* rebased

* exceptions fixed

* reformatting

* renamed

* fixed

* Added new line

Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>
Co-authored-by: Katarina Supe <61758502+katarinasupe@users.noreply.github.com>

* Add lazy argument to Memgraph (#159)

* [develop < T0098-GA] Add datetime support (#161)

* Add datetime support

* Change value_type to value

* Add new tests

* Format timedelta and add datetime tests

* Add datetimeKwMapping and change call to one-liner

* Fix flake8

* Fix import formatting

Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>

* changed string variables for Blob and S3 kwargs (#151)

* Update bug_report.md

* [master <  T0068-GA] Update README (#136)

* Update README

* Fix broken link

* Move emojis

* Add table to title

* changed string variables for Blob and S3 kwargs

Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>
Co-authored-by: Katarina Supe <61758502+katarinasupe@users.noreply.github.com>

* [develop < T0086-GA] Change arguments in RETURN method (#146)

* Change arguments in return method

* Add backward compatibility

* Add newline

* Add minor changes

* Add Iterable and fix if logic

* add enum

* Remove super call; Add Iterable to OrderBy; Remove read_str method

* Change arguments for yield, with; create new class

* Remove unnecessary super constructor call

* [develop < T0071-GA-bfs-and-shortest-path] added base class and integrated into edge query (#141)

* added base class and integrated into edge query

* on comments

* comment fixes

* Add minor docstring changes

* Reorder imports

* convert other @Property's to positive logic

* boris comments

* add pass to abstractmethod

* removed temp var use

Co-authored-by: Ivan Despot <ivan.g.despot@outlook.com>

* [T0071-GA < BFS] add bfs class and tests (#142)

* added base class and integrated into edge query

* added bfs class and tests

* rename to BreadthFirstSearch

* on comments

* on comments

* comment fixes

* mrma comments

* Add minor docstring changes

* Update memgraph.py

* boris comments

* flake8 fixes

Co-authored-by: Ivan Despot <ivan.g.despot@outlook.com>

* [develop < T0059-GA] Add SET method to the query builder (#128)

* Introduced SET Clause support

* Implementation Done; Tests Added

* formatting

* minor formatting

* Removed templates

* unused imports removed

* unused imports removed

* Rename to SetOperator and add new tests

* Add query clause enum in exceptions

Co-authored-by: Boris Tasevski <boris.tasevski@memgraph.io>
Co-authored-by: katarinasupe <supe.katarina@gmail.com>

* [T0071-GA < DFS] add dfs and tests (#144)

* added base class and integrated into edge query

* add dfs and tests

* on comments

* add bounds tests and (e, v) -> (r, n)

* comment fixes

* mrma comments

* blank line removal

* boris comments

* remove duplicate code

* duplicate code

* fix

* [T0071-GA < wShortest] added WeightedShortestPath and tests (#143)

* added base class and integrated into edge query

* added wShortest and tests

* on comments

* comment fixes

* mrma comments and refactoring

* another

* fix

* make upper bound str since the init

* [develop < T0059-GA] Add SET method to the query builder (#128)

* Introduced SET Clause support

* Implementation Done; Tests Added

* formatting

* minor formatting

* Removed templates

* unused imports removed

* unused imports removed

* Rename to SetOperator and add new tests

* Add query clause enum in exceptions

Co-authored-by: Boris Tasevski <boris.tasevski@memgraph.io>
Co-authored-by: katarinasupe <supe.katarina@gmail.com>

* [develop < T0026-GA] Wrap query modules (#130)

* first draft

* stash changes 2

* finished parse_signature

* make it work, add docstrings

* formatting

* added tests +

* reorganize tests

* add mock test for get_procedures, to avoid needing MAGE

* startswith -> starts_with

* starts_with in docstring

* ok i will not edit in github again. starts_with in description

* refactor _parse_field

* added QB test, moved parser to utilities, Kate changes

* test fix

* refactor and comments from Mrma

* comments fixes

* finish merge lol

* Add missing quotes and remove duplicate

* Remove extra line in exceptions

* Change to return only item

* Remove Iterable from argument type

* Change elif to if and remove else

* Remove Iterable from order_by

* [develop < T0081-GA] Rename Edge to Relationship (#145)

* Rename edge to relationship; add kwargs in tests

* Fix test on docs

* [develop < TOO53-GA] Investigate Timeout error (#120)

* Update dependencies

* Increase Bolt session inactivity timeout

* Update workflow

* Update workflow

* Add config flag --also-log-to-stderr

* Catch Memgraph logs

* Catch Memgraph logs

* Update log level

* Upload log as artifact

* Add log file

* Create new log directory

* Run Action step even if error is thrown

* Change session nactivity timeout

* Change Ubuntu GitHub job

* Update Ubuntu GitHub job

* Update Ubuntu GitHub job

* Update Ubuntu GitHub job

* Update Ubuntu GitHub job

* Update GitHub action paths

* Update GitHub action paths

* Update GitHub action permissions

* Update GitHub action

* Update GitHub action

* Update GitHub action

* Update GitHub action

* Update GitHub action

* Update GitHub action

* [develop < T0070-GA] Add more clauses for base classes (#139)

* added load_csv, tests

* add return base class, change CSV to Csv

* black formatting

* Change edge in loaders

* Change labels_str -> type_str; edge_label-> relationship_type

Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>
Co-authored-by: Bruno Sačarić <bruno.sacaric@gmail.com>

* moved integrated algorithms (#147)

* [develop < T0034-GA] Add Field to models (#122)

* Add Field to models

* Remove Field from gqlalchemy init

* [develop < T0054-GA] Add option to suppress warning GQLAlchemySubclassNotFoundWarning (#121)

* Ignore warning in tests

* Set lazy loading to false

* Add codeowner

* host and port read only (#156)

* Update bug_report.md

* [master <  T0068-GA] Update README (#136)

* Update README

* Fix broken link

* Move emojis

* Add table to title

* host and port read only

Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>
Co-authored-by: Katarina Supe <61758502+katarinasupe@users.noreply.github.com>

* [develop < T0094-GA] Variable support for node and edge properties (#154)

* added functionality and tests

* add docstring

* add test for relationship

* black

* migrated check to to_cypher_value

* community fixes

* change test names

* type checking

* renamed variable value to name

* new connection private method (#157)

* Update bug_report.md

* [master <  T0068-GA] Update README (#136)

* Update README

* Fix broken link

* Move emojis

* Add table to title

* new connection private method

Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>
Co-authored-by: Katarina Supe <61758502+katarinasupe@users.noreply.github.com>

* [develop < T0074-GA] Remove sudo from instance_runner (#148)

* Remove sudo

* Remove unused import

* exceptions fixed (#153)

* Update bug_report.md

* [master <  T0068-GA] Update README (#136)

* Update README

* Fix broken link

* Move emojis

* Add table to title

* exceptions fixed

* fixed stream tests

* reformatting

* Update bug_report.md

* [master <  T0068-GA] Update README (#136)

* Update README

* Fix broken link

* Move emojis

* Add table to title

* exceptions fixed

* fixed stream tests

* reformatting

* rebased

* exceptions fixed

* reformatting

* renamed

* fixed

* Added new line

Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>
Co-authored-by: Katarina Supe <61758502+katarinasupe@users.noreply.github.com>

* moved integrated algorithms (#147)

* Add lazy argument to Memgraph (#159)

* [develop < T0098-GA] Add datetime support (#161)

* Add datetime support

* Change value_type to value

* Add new tests

* Format timedelta and add datetime tests

* Add datetimeKwMapping and change call to one-liner

* Fix flake8

* Fix import formatting

Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>

* changed string variables for Blob and S3 kwargs (#151)

* Update bug_report.md

* [master <  T0068-GA] Update README (#136)

* Update README

* Fix broken link

* Move emojis

* Add table to title

* changed string variables for Blob and S3 kwargs

Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>
Co-authored-by: Katarina Supe <61758502+katarinasupe@users.noreply.github.com>

* Add example in docstring and docs test

Co-authored-by: Ivan Despot <ivan.g.despot@outlook.com>
Co-authored-by: Bruno Sačarić <bruno.sacaric@gmail.com>
Co-authored-by: Boris Taševski <36607228+BorisTasevski@users.noreply.github.com>
Co-authored-by: Boris Tasevski <boris.tasevski@memgraph.io>
Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>
Co-authored-by: niko4299 <51059248+niko4299@users.noreply.github.com>

* fix bad query in save_relationship_with_id (#166)

* Update bug_report.md

* [master <  T0068-GA] Update README (#136)

* Update README

* Fix broken link

* Move emojis

* Add table to title

* fix bad query in save_relationship_with_id

Fixes the error in the cypher query of memgraph.save_relationship_with_id() caused by an unbound variable in the return statement.

Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>
Co-authored-by: Katarina Supe <61758502+katarinasupe@users.noreply.github.com>

* [develop <  T0089-GA] Create Operator Enum (#165)

* Add WhereOperator enum and update tests

* Add exceptions if str value is wrong

* Change to Operator

* fix bad query in save_relationship_with_id (#166)

* Update bug_report.md

* [master <  T0068-GA] Update README (#136)

* Update README

* Fix broken link

* Move emojis

* Add table to title

* fix bad query in save_relationship_with_id

Fixes the error in the cypher query of memgraph.save_relationship_with_id() caused by an unbound variable in the return statement.

Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>
Co-authored-by: Katarina Supe <61758502+katarinasupe@users.noreply.github.com>

Co-authored-by: Daniel <dadevel-github@webhq.eu>
Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>

* [develop < T0066-GA] Add foreach to query builder (#135)

* foreach using another query_builder for update_clause

* add comment

* added base class

* added functionality and tests

* add docstring

* add test for relationship

* black

* migrated check to to_cypher_value

* community fixes

* change test names

* type checking

* make tests work good

* black format

* Update docstring

Co-authored-by: Katarina Supe <61758502+katarinasupe@users.noreply.github.com>

* non double negative logic

* done did double negation fix

* add Set[str]

* add set[str]

* missing parantheses

* added Set import

* black format

* Add minor changes

* add example and kwarg names

* formatting, renamed update_clauses to update_clause

* removed checking None in properties

Co-authored-by: Katarina Supe <61758502+katarinasupe@users.noreply.github.com>
Co-authored-by: Ivan Despot <ivan.g.despot@outlook.com>

* [develop < T0093] Add query module arguments as tuples (#155)

* Added arguments of query modules as tuples

* Replaced foreach argument x for arg

* Added another test with query procedures as tuples

* Flake corrected and poetry

* Added parsing of qm arguments to utilities

* Removed self from utilities function

Co-authored-by: josipmrden <josip.mrden@external-basf.com>

* [develop < T0106] fix @Property being optional when they are not (#167)

* I see no changes, wake up in the morning and I ask myself

* move None check to constructor

* [develop < T0103-GA] Add docstring examples (#162)

* Add docstring examples

* Add kwards

* Fix test union typo

* Update set docstring examples + add execute

* Update to Operator in examples

* Update skip and limit arguments

* fix bad query in save_relationship_with_id (#166)

* Update bug_report.md

* [master <  T0068-GA] Update README (#136)

* Update README

* Fix broken link

* Move emojis

* Add table to title

* fix bad query in save_relationship_with_id

Fixes the error in the cypher query of memgraph.save_relationship_with_id() caused by an unbound variable in the return statement.

Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>
Co-authored-by: Katarina Supe <61758502+katarinasupe@users.noreply.github.com>

* [develop <  T0089-GA] Create Operator Enum (#165)

* Add WhereOperator enum and update tests

* Add exceptions if str value is wrong

* Change to Operator

* fix bad query in save_relationship_with_id (#166)

* Update bug_report.md

* [master <  T0068-GA] Update README (#136)

* Update README

* Fix broken link

* Move emojis

* Add table to title

* fix bad query in save_relationship_with_id

Fixes the error in the cypher query of memgraph.save_relationship_with_id() caused by an unbound variable in the return statement.

Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>
Co-authored-by: Katarina Supe <61758502+katarinasupe@users.noreply.github.com>

Co-authored-by: Daniel <dadevel-github@webhq.eu>
Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>

* Minor language fixes

Co-authored-by: Daniel <dadevel-github@webhq.eu>
Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>

* [develop < T0067] Sync push stream query modules (#158)

* Added query modules from gqlalchemy

* with kafka stream

* fixed

* test

* added stream module loading

* Added query modules from gqlalchemy

* with kafka stream

* fixed

* test

* added stream module loading

* added tests

* poetry fixed

* something wrong with test

* test still not fixed, execute and fetch problem

* fixed tests

* Added query modules from gqlalchemy

* with kafka stream

* fixed

* test

* added stream module loading

* added tests

* Added query modules from gqlalchemy

* with kafka stream

* fixed

* test

* added stream module loading

* poetry fixed

* something wrong with test

* test still not fixed, execute and fetch problem

* fixed tests

* toml

* test hopefully fixed

* Added return type for integrations with query modules

* Rename gqlalchemy error handler to database error handler

* Formatting

* Made add_query_module as a public method so users can add their own query modules to Memgraph

* Update docstring for adding query modules

* Renamed test file

* Made add_query_module function public in tests

* Function correction

* Formatting

* fixed tests

* reformated

Co-authored-by: josipmrden <josip.mrden@external-basf.com>

* [T0093 < T0096] Wrap MAGE query modules for autocompletion (#168)

* Added arguments of query modules as tuples

* Added modules in Memgraph query builder

* Added modules for memgraph mage

* Replaced foreach argument x for arg

* Added another test with query procedures as tuples

* Flake corrected and poetry

* Added parsing of qm arguments to utilities

* Removed self from utilities function

* Written tests to see if every method in code is present in Memgraph

* Assert reverse case, that every memgraph query module is written inside code

* Updated documentation for Mage query builder

* Formatting

* Imports from 3rd party libraries go before gqlalchemy

* Format imports

* Add networkx to github workflows

* Add networkx to github workflows attempt 2

* Add networkx to github workflows attempt 3

* Add networkx to github workflows attempt 4

* Add networkx to github workflows attempt 5

* Add networkx to github workflows attempt 6

* Add networkx to github workflows attempt 7

* Add networkx to github workflows attempt 8

* Add numpy to installed packages

* Addded scipy to installed packages

* Corrected Sudo command to sudo

* Removed sudo completely from the windows github workflows

Co-authored-by: josipmrden <josip.mrden@external-basf.com>

* [develop < T0091-GA] Add support for Neo4j (#149)

* Add Neo4j OGM support

* Update workflow

* Update workflow

* Update workflow

* Refactor code

* Refactor code

* Fix ensure_indexes()

* Refactor code

* Add Neo4j tests for query builder

* Refactor query builder and tests

* Update workflow

* Update workflow

* Update workflow

* Update workflow

* Update workflow

* Update workflow

* Update workflow

* Update workflow

* Update workflow

* Update workflow

* Update workflow

* Update workflow

* Update workflow

* Update workflow

* Update workflow

* Update workflow

* Update workflow

* Update workflow

* Refactor query builder tests

* Replace Connection objects with Database

* Reorder imports

* Update docstrings and database arguments

* Remove unused import

* Add merge related updates

* Refactor code and address comments

* Fix poetry.lock

* Fix poetry.lock

* Fix dependencies

* Fix pip installation for Memgraph

* Update workflow

* Update workflow

* Update workflow

* Update workflow

* Update workflow

* [develop < T0099 GA] replace relative imports (#160)

* first step

* first try

* try

* absolute in init

* all gqlalchemy/ absolutes

* Reorder and group imports

* Reorder imports

* return of the Operator

* PEP8 standard

* fix import error (lol)

* Installing networkx with windows workflow

* remove duplicate import

Co-authored-by: Ivan Despot <ivan.g.despot@outlook.com>
Co-authored-by: g-despot <66276597+g-despot@users.noreply.github.com>
Co-authored-by: josipmrden <josip.mrden@external-basf.com>

* [develop < T0100-GA] Wait for Active Connection (#164)

* Implemented wait for connection; Tests pending

* wait for connection completed; code refactoring done

* merge error

* formatting errors fixed

* minor update

* rename variable

* formatting error fixed

* docstring added

Co-authored-by: Boris Tasevski <boris.tasevski@memgraph.io>

* [develop < ] Rename relationship type argument (#171)

* renamed labels to type

* renamed to not conflict with PartialQuery type

* Update README (#169)

* [develop < T0109-GA] Remove excess Iterable type (#172)

* Update arg type

* Remove unused imports

* [develop < ] Rename relationship type argument (#171)

* renamed labels to type

* renamed to not conflict with PartialQuery type

* Update README (#169)

Co-authored-by: Bruno Sačarić <bruno.sacaric@gmail.com>

* [master < T0107-GA] Update docs generation (#170)

* Update docs generation

* Update documentation

* Release GQLAlchemy 1.3

Co-authored-by: MasterMedo <mislav.vuletic@gmail.com>
Co-authored-by: katarinasupe <supe.katarina@gmail.com>
Co-authored-by: Bruno Sacaric <bruno.sacaric@gmail.com>
Co-authored-by: Bruno Sačarić <31968691+brunos252@users.noreply.github.com>
Co-authored-by: Boris Taševski <36607228+BorisTasevski@users.noreply.github.com>
Co-authored-by: Katarina Supe <61758502+katarinasupe@users.noreply.github.com>
Co-authored-by: Boris Tasevski <boris.tasevski@memgraph.io>
Co-authored-by: niko4299 <51059248+niko4299@users.noreply.github.com>
Co-authored-by: Daniel <dadevel-github@webhq.eu>
Co-authored-by: Josipmrden <josip.mrden@memgraph.io>
Co-authored-by: josipmrden <josip.mrden@external-basf.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status: ready PR is ready for review
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

[ENHANCEMENT] add simpler use of return in query builder [ENHANCEMENT] Make type hints more permissive
6 participants