Skip to content

Allow for multiple SDNA classes with same name by same author #621

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.

Sign up for GitHub

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

Merged
jhweir merged 2 commits into from
Sep 2, 2025
Merged

Allow for multiple SDNA classes with same name by same author #621

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4171a90
Allow for multiple SDNA classes with same name by same author
lucksus Sep 1, 2025
e362243
fmt
lucksus Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 32 additions & 35 deletions rust-executor/src/perspectives/perspective_instance.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use super::update_perspective;
use super::utils::{
prolog_get_all_string_bindings, prolog_get_first_string_binding, prolog_resolution_to_string,
};
use crate::agent::{self, create_signed_expression};
use crate::agent::create_signed_expression;
use crate::graphql::graphql_types::{
DecoratedPerspectiveDiff, ExpressionRendered, JsResultType, LinkMutations, LinkQuery,
LinkStatus, NeighbourhoodSignalFilter, OnlineAgent, PerspectiveExpression, PerspectiveHandle,
Expand Down Expand Up @@ -1155,7 +1155,7 @@ impl PerspectiveInstance {
mut sdna_code: String,
sdna_type: SdnaType,
) -> Result<bool, AnyError> {
let mut added = false;
//let mut added = false;
let mutex = self.sdna_change_mutex.clone();
let _guard = mutex.lock().await;

Expand All @@ -1169,50 +1169,47 @@ impl PerspectiveInstance {
.to_url()
.expect("just initialized Literal couldn't be turned into URL");

let links = self
.get_links(&LinkQuery {
source: Some("ad4m://self".to_string()),
predicate: Some(predicate.to_string()),
target: Some(literal_name.clone()),
from_date: None,
until_date: None,
limit: None,
})
.await?;

let author = agent::did();

let mut sdna_links: Vec<Link> = Vec::new();

let links = links
.into_iter()
.filter(|l| l.author == author)
.collect::<Vec<DecoratedLinkExpression>>();

if (Literal::from_url(sdna_code.clone())).is_err() {
sdna_code = Literal::from_string(sdna_code)
.to_url()
.expect("just initialized Literal couldn't be turned into URL");
}

if links.is_empty() {
sdna_links.push(Link {
source: "ad4m://self".to_string(),
predicate: Some(predicate.to_string()),
target: literal_name.clone(),
});
// let links = self
// .get_links(&LinkQuery {
// source: Some("ad4m://self".to_string()),
// predicate: Some(predicate.to_string()),
// target: Some(literal_name.clone()),
// from_date: None,
// until_date: None,
// limit: None,
// })
// .await?;
// let author = agent::did();
// let links = links
// .into_iter()
// .filter(|l| l.author == author)
// .collect::<Vec<DecoratedLinkExpression>>();
//if links.is_empty() {
sdna_links.push(Link {
source: "ad4m://self".to_string(),
predicate: Some(predicate.to_string()),
target: literal_name.clone(),
});

sdna_links.push(Link {
source: literal_name.clone(),
predicate: Some("ad4m://sdna".to_string()),
target: sdna_code,
});
sdna_links.push(Link {
source: literal_name.clone(),
predicate: Some("ad4m://sdna".to_string()),
target: sdna_code,
});

self.add_links(sdna_links, LinkStatus::Shared, None).await?;
added = true;
}
self.add_links(sdna_links, LinkStatus::Shared, None).await?;
//added = true;
//}
// Mutex guard is automatically dropped here
Ok(added)
Ok(true)
}

async fn ensure_prolog_engine_pool(&self) -> Result<(), AnyError> {
Expand Down