Skip to content
This repository has been archived by the owner on Sep 12, 2024. It is now read-only.

Commit

Permalink
[BUGFIX]: Missing EdgeAnchor.is_undirected & Rename NO_ACESSS
Browse files Browse the repository at this point in the history
  • Loading branch information
@amadolid
amadolid committed Aug 9, 2024
1 parent f8bfcac commit 92e9337
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
27 changes: 14 additions & 13 deletions jaclang_jaseci/core/architype.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ def disconnect_edge(self, anchor: "Anchor") -> None:
# level = AccessLevel.cast(level)
# access = self.access.nodes
# if access.whitelist:
# if (ref_id := node.ref_id) and level != access.anchors.get(ref_id, AccessLevel.NO_ACESSS):
# if (ref_id := node.ref_id) and level != access.anchors.get(ref_id, AccessLevel.NO_ACCESS):
# access.anchors[ref_id] = level
# self._set.update({f"access.nodes.anchors.{ref_id}": level.name})
# self._unset.pop(f"access.nodes.anchors.{ref_id}", None)
Expand Down Expand Up @@ -343,7 +343,7 @@ def disconnect_edge(self, anchor: "Anchor") -> None:
# level = AccessLevel.cast(level)
# if access := self.access.types.get(type):
# if access.whitelist:
# if (ref_id := node.ref_id) and level != access.anchors.get(ref_id, AccessLevel.NO_ACESSS):
# if (ref_id := node.ref_id) and level != access.anchors.get(ref_id, AccessLevel.NO_ACCESS):
# access.anchors[ref_id] = level
# name = type.__ref_cls__()
# self._set.update({f"access.types.{name}.anchors.{ref_id}": level.name})
Expand Down Expand Up @@ -379,7 +379,7 @@ def allow_root( # type: ignore[override]
access = self.access.roots
if access.whitelist:
if (ref_id := root.ref_id) and level != access.anchors.get(
ref_id, AccessLevel.NO_ACESSS
ref_id, AccessLevel.NO_ACCESS
):
access.anchors[ref_id] = level
self._set.update({f"access.roots.anchors.{ref_id}": level.name})
Expand Down Expand Up @@ -409,9 +409,9 @@ def unrestrict(self, level: AccessLevel | int | str = AccessLevel.READ) -> None:

def restrict(self) -> None:
"""Disallow others to access current Architype."""
if self.access.all > AccessLevel.NO_ACESSS:
self.access.all = AccessLevel.NO_ACESSS
self._set.update({"access.all": AccessLevel.NO_ACESSS.name})
if self.access.all > AccessLevel.NO_ACCESS:
self.access.all = AccessLevel.NO_ACCESS
self._set.update({"access.all": AccessLevel.NO_ACCESS.name})

# ------------------------------------------------ #

Expand Down Expand Up @@ -593,7 +593,7 @@ def sync_hash(self) -> None:

async def has_read_access(self, to: "Anchor") -> bool: # type: ignore[override]
"""Read Access Validation."""
return await self.access_level(to) > AccessLevel.NO_ACESSS
return await self.access_level(to) > AccessLevel.NO_ACCESS

async def has_connect_access(self, to: "Anchor") -> bool: # type: ignore[override]
"""Write Access Validation."""
Expand All @@ -609,12 +609,12 @@ async def access_level(self, to: "Anchor") -> AccessLevel: # type: ignore[overr

jctx = JaseciContext.get()

to.state.current_access_level = AccessLevel.NO_ACESSS
to.state.current_access_level = AccessLevel.NO_ACCESS
if jctx.root == jctx.super_root or jctx.root.id == to.root or jctx.root == to:
to.state.current_access_level = AccessLevel.WRITE
return to.state.current_access_level

if (to_access := to.access).all > AccessLevel.NO_ACESSS:
if (to_access := to.access).all > AccessLevel.NO_ACCESS:
to.state.current_access_level = to_access.all

if to.root and (
Expand All @@ -629,7 +629,7 @@ async def access_level(self, to: "Anchor") -> AccessLevel: # type: ignore[overr
whitelist, level = to_root.access.roots.check(jctx.root.ref_id)
if not whitelist:
if level < AccessLevel.READ:
to.state.current_access_level = AccessLevel.NO_ACESSS
to.state.current_access_level = AccessLevel.NO_ACCESS
return to.state.current_access_level
elif level < to.state.current_access_level:
level = to.state.current_access_level
Expand All @@ -639,7 +639,7 @@ async def access_level(self, to: "Anchor") -> AccessLevel: # type: ignore[overr
whitelist, level = to_access.roots.check(jctx.root.ref_id)
if not whitelist:
if level < AccessLevel.READ:
to.state.current_access_level = AccessLevel.NO_ACESSS
to.state.current_access_level = AccessLevel.NO_ACCESS
return to.state.current_access_level
elif level < to.state.current_access_level:
level = to.state.current_access_level
Expand All @@ -652,7 +652,7 @@ async def access_level(self, to: "Anchor") -> AccessLevel: # type: ignore[overr
# whitelist, level = access_type.check(self)
# if not whitelist:
# if level < AccessLevel.READ:
# to.state.current_access_level = AccessLevel.NO_ACESSS
# to.state.current_access_level = AccessLevel.NO_ACCESS
# return to.state.current_access_level
# elif level < to.state.current_access_level:
# level = to.state.current_access_level
Expand All @@ -662,7 +662,7 @@ async def access_level(self, to: "Anchor") -> AccessLevel: # type: ignore[overr
# whitelist, level = to_access.nodes.check(self)
# if not whitelist:
# if level < AccessLevel.READ:
# to.state.current_access_level = AccessLevel.NO_ACESSS
# to.state.current_access_level = AccessLevel.NO_ACCESS
# return to.state.current_access_level
# elif level < to.state.current_access_level:
# level = to.state.current_access_level
Expand Down Expand Up @@ -1016,6 +1016,7 @@ def serialize(self) -> dict[str, object]:
**super().serialize(),
"source": self.source.ref_id if self.source else None,
"target": self.target.ref_id if self.target else None,
"is_undirected": self.is_undirected,
}


Expand Down
2 changes: 1 addition & 1 deletion jaclang_jaseci/jaseci/datasources/collection.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ def get_database() -> AsyncIOMotorDatabase:
"""Return pymongo.database.Database for database connection based from current client connection."""
if not isinstance(Collection.__database__, AsyncIOMotorDatabase):
Collection.__database__ = Collection.get_client().get_database(
getenv("DATABASE_NAME", "jaclang")
getenv("DATABASE_NAME", "jaseci")
)

return Collection.__database__
Expand Down

0 comments on commit 92e9337

Please sign in to comment.