Skip to content

Commit

Permalink
get empty
Browse files Browse the repository at this point in the history
  • Loading branch information
mudphudwang committed Sep 21, 2023
1 parent ee73611 commit 2ff2fa0
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
9 changes: 6 additions & 3 deletions djutils/lists.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,12 @@ def get(cls, restrictions):
keys = [cls.key_source.restrict(_).fetch1() for _ in restrictions]
n = len(keys)

candidates = cls & f"members = {n}"
members = cls.Member & keys
key = candidates.aggr(members, n="count(*)") & f"n = {n}"
if n:
candidates = cls & f"members = {n}"
members = cls.Member & keys
key = candidates.aggr(members, n="count(*)") & f"n = {n}"
else:
key = cls & "members = 0"

if key:
return key.fetch1(dj.key)
Expand Down
9 changes: 6 additions & 3 deletions djutils/sets.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,12 @@ def get(cls, restriction):
key = cls.key_source & restriction
n = len(key)

candidates = cls & f"members = {n}"
members = cls.Member & key
key = candidates.aggr(members, n="count(*)") & f"n = {n}"
if n:
candidates = cls & f"members = {n}"
members = cls.Member & key
key = candidates.aggr(members, n="count(*)") & f"n = {n}"
else:
key = cls & "members = 0"

if key:
return key.fetch1(dj.key)
Expand Down
6 changes: 2 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@

setup(
name="djutils",
version="0.0.1",
version="0.1.0",
description="Datajoint Utilities",
packages=find_packages(),
install_requires=[
"datajoint>=0.12.9,<0.13.0"
],
install_requires=["datajoint>=0.12.9,<0.13.0"],
)

0 comments on commit 2ff2fa0

Please sign in to comment.