Skip to content

Commit

Permalink
Merge pull request #789 from neo4j-contrib/rc/5.3.0
Browse files Browse the repository at this point in the history
Release 5.3.0
  • Loading branch information
mariusconjeaud committed Apr 22, 2024
2 parents 4bd6302 + 0aeac32 commit f8e2350
Show file tree
Hide file tree
Showing 118 changed files with 12,414 additions and 2,363 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ development.env
.ropeproject
\#*\#
.eggs
bin
lib
.vscode
pyvenv.cfg
Expand Down
25 changes: 13 additions & 12 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
repos:
- repo: https://github.com/psf/black
rev: 22.3.0
hooks:
- id: black
- repo: https://github.com/PyCQA/isort
rev: 5.11.5
hooks:
- id: isort
# - repo: local
# hooks:
# - id: pylint
# name: pylint
# entry: pylint neomodel/
# language: system
# always_run: true
# pass_filenames: false
args: ["--profile", "black"]
- repo: https://github.com/psf/black
rev: 23.3.0
hooks:
- id: black
- repo: local
hooks:
- id: unasync
name: unasync
entry: bin/make-unasync
language: python
files: "^(neomodel/async_|test/async_)/.*"
additional_dependencies: [unasync, isort, black]
6 changes: 6 additions & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
Version 5.3.0 2024-04
* Add async support
* Breaking change : config.AUTO_INSTALL_LABELS has been removed. Please use the neomodel_install_labels script instead
* Bumps neo4j (driver) to 5.19.0
* Various improvement : functools wrap to TransactionProxy, fix node equality check, q filter for IN in arrays, fix inflate on db_property. Thanks to @giosava94, @OlehChyhyryn, @icapora, @j-krose

Version 5.2.1 2023-12
* Add options to inspection script to skip heavy operations - rel props or cardinality inspection #767
* Fixes database version parsing issues
Expand Down
71 changes: 58 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,21 @@ GitHub repo found at <https://github.com/neo4j-contrib/neomodel/>.

# Documentation

(Needs an update, but) Available on
Available on
[readthedocs](http://neomodel.readthedocs.org).

# Upcoming breaking changes notice - \>=5.3
# New in 5.3.0

Based on Python version [status](https://devguide.python.org/versions/),
neomodel will be dropping support for Python 3.7 in an upcoming release
(5.3 or later). This does not mean neomodel will stop working on Python 3.7, but
it will no longer be tested against it. Instead, we will try to add
support for Python 3.12.
neomodel now supports asynchronous programming, thanks to the [Neo4j driver async API](https://neo4j.com/docs/api/python-driver/current/async_api.html). The [documentation](http://neomodel.readthedocs.org) has been updated accordingly, with an updated getting started section, and some specific documentation for the async API.

Another source of upcoming breaking changes is the addition async support to
neomodel. No date is set yet, but the work has progressed a lot in the past weeks ;
and it will be part of a major release (potentially 6.0 to avoid misunderstandings).
You can see the progress in [this branch](https://github.com/neo4j-contrib/neomodel/tree/task/async).
# Breaking change in 5.3.0

Finally, we are looking at refactoring some standalone methods into the
Database() class. More to come on that later.
- config.AUTO_INSTALL_LABELS has been removed. Please use the `neomodel_install_labels` script instead. _Note : this is because of the addition of async, but also because it might lead to uncontrolled creation of indexes/constraints. The script makes you more in control of said creation._
- Based on Python version [status](https://devguide.python.org/versions/),
neomodel will be dropping support for Python 3.7 in an upcoming release
(5.3 or later). _This does not mean neomodel will stop working on Python 3.7, but
it will no longer be tested against it_
- Some standalone methods have been refactored into the Database() class. Check the [documentation](http://neomodel.readthedocs.org) for a full list.

# Installation

Expand All @@ -67,6 +64,15 @@ To install from github:

$ pip install git+git://github.com/neo4j-contrib/neomodel.git@HEAD#egg=neomodel-dev

# Performance comparison

You can find some performance tests made using Locust [in this repo](https://github.com/mariusconjeaud/neomodel-locust).

Two learnings from this :

* The wrapping of the driver made by neomodel is very thin performance-wise : it does not add a lot of overhead ;
* When used in a concurrent fashion, async neomodel is faster than concurrent sync neomodel, and a lot of faster than serial queries.

# Contributing

Ideas, bugs, tests and pull requests always welcome. Please use
Expand Down Expand Up @@ -112,3 +118,42 @@ against all supported Python interpreters and neo4j versions: :

# in the project's root folder:
$ sh ./tests-with-docker-compose.sh

## Developing with async

### Transpiling async -> sync

We use [this great library](https://github.com/python-trio/unasync) to automatically transpile async code into its sync version.

In other words, when contributing to neomodel, only update the `async` code in `neomodel/async_`, then run : :

bin/make-unasync
isort .
black .

Note that you can also use the pre-commit hooks for this.

### Specific async/sync code
This transpiling script mainly does two things :

- It removes the await keywords, and the Async prefixes in class names
- It does some specific replacements, like `adb`->`db`, `mark_async_test`->`mark_sync_test`

It might be that your code should only be run for `async`, or `sync` ; or you want different stubs to be run for `async` vs `sync`.
You can use the following utility function for this - taken from the official [Neo4j python driver code](https://github.com/neo4j/neo4j-python-driver) :

# neomodel/async_/core.py
from neomodel._async_compat.util import AsyncUtil

# AsyncUtil.is_async_code is always True
if AsyncUtil.is_async_code:
# Specific async code
# This one gets run when in async mode
assert await Coffee.nodes.check_contains(2)
else:
# Specific sync code
# This one gest run when in sync mode
assert 2 in Coffee.nodes

You can check [test_match_api](test/async_/test_match_api.py) for some good examples, and how it's transpiled into sync.

Loading

0 comments on commit f8e2350

Please sign in to comment.