Skip to content

pr treat node and edge separate in network table and node_search zod requirements update #41

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

Closed
wants to merge 2 commits into from
+135 −36
Closed

pr treat node and edge separate in network table and node_search zod requirements update #41

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15ee3ee
init commit for demo
AndrewLutsky Apr 1, 2025
38aa199
removed Unnamed: 0 column
AndrewLutsky May 8, 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
4 changes: 2 additions & 2 deletions app/api/knowledge_graph/node_search/route.ts
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ import { convert_query } from "@/utils/helper"
const query_schema = z.object({
type: z.string(),
field: z.optional(z.string()),
term: z.optional(z.string()),
term: z.optional(z.union([z.string(), z.number(), z.nan()])),
limit: z.optional(z.number()),
filter: z.optional(zu.stringToJSON())
})
@@ -75,4 +75,4 @@ export async function GET(req: NextRequest) {
return NextResponse.json(error, { status: 400 })
}

}
}
167 changes: 133 additions & 34 deletions components/TermAndGeneSearch/network_table.tsx
View file
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@ import { DataGrid, GridToolbar, GridColDef } from "@mui/x-data-grid";
import { UISchema } from "@/app/api/schema/route";
import { NetworkSchema } from "@/app/api/knowledge_graph/route";
import { CustomToolbar } from "../Enrichment/NetworkTable";

const NetworkTable = ({data, schema}: {data: NetworkSchema, schema: UISchema}) => {
const [processedData, setProcessedData] = useState<{
[key:string]: {
@@ -15,40 +16,142 @@ const NetworkTable = ({data, schema}: {data: NetworkSchema, schema: UISchema}) =
columnVisibilityModel: {[key: string]: boolean}
}
} | null>(null)
// const [mapper, setMapper] = useState({})
const tableRef = useRef(null)
const [tab, setTab] = useState<null | string>(null)
const [tabs, setTabs] = useState<Array<string>>(null)
const display = {}

// Separate display configs for nodes and edges
const nodeDisplay = {}
const edgeDisplay = {}

for (const i of schema.nodes) {
display[i.node] = i.display
nodeDisplay[i.node] = i.display
}
for (const i of schema.edges) {
for (const m of i.match) {
display[m] = i.display
edgeDisplay[m] = i.display
}
}

useEffect(()=>{
if (data) {
const processed = {}
const id_mapper = {}
const node_tabs = []
const edge_tabs = []
for (const d of [...data.nodes, ...data.edges]) {

// Process nodes first
for (const d of data.nodes) {
const properties = d.data
const {kind, relation, source, target, label, "Unnamed: 0": _, ...rest} = d.data
const {kind, relation, source, target, label, ...rest} = d.data
const key = `node_${kind}`

if (kind && typeof kind === 'string') {
if (processed[key] === undefined) {
node_tabs.push(key)
processed[key] = {header: [], data: {}, columnVisibilityModel: {}}
const header = []
const columnVisibilityModel = {}

if (nodeDisplay[kind]) {
for (const prop of nodeDisplay[kind]) {
const field = prop.label
columnVisibilityModel[field] = !(prop.hide)
if (prop.type === "link") {
header.push({
field,
headerName: field,
flex: 1,
style: {flexDirection: "row"},
align: "left",
text: prop.text,
href: prop.href,
renderCell: ({row, field})=>{
return <Button href={row[field].href}>{row[field].text}</Button>
},
count: 0
})
} else {
header.push({
field,
headerName: field,
flex: 1,
style: {flexDirection: "row"},
align: "left",
text: prop.text,
count: 0
})
}
}
} else {
header.push({
field: 'label',
headerName: "Label",
flex: 1,
style: {flexDirection: "row"},
align: "left",
type: "node",
})
for (const field of Object.keys(rest)) {
const headerName = field.replaceAll(".", " ")
header.push({
field,
headerName: headerName.charAt(0).toUpperCase() + headerName.slice(1),
style: {flexDirection: "row"},
align: "left",
type: "node",
count: 0
})
}
}
processed[key].header = header
processed[key].columnVisibilityModel = columnVisibilityModel
}

// Process node data
if (processed[key].data[properties.id] === undefined) {
processed[key].data[properties.id] = {id: properties.id}
}
for (const i of processed[key].header) {
if (i.href) {
const val = makeTemplate(i.text, properties)
const href = makeTemplate(i.href, properties)
processed[key].data[properties.id][i.field] = {
text: val === "undefined" ? "": val,
href: href === "undefined" ? "": href
}
if (val !== "undefined") {
i.count = i.count + 1
}
} else {
const val = makeTemplate(i.text, properties)
processed[key].data[properties.id][i.field] = val === "undefined" ? "": precise(val)
if (val !== "undefined") {
i.count = i.count + 1
}
}
}
if (processed[key].data[properties.id]["label"] === "") {
processed[key].data[properties.id]["label"] = label
}
}
}

// Process edges
for (const d of data.edges) {
const properties = d.data
const {kind, relation, source, target, label, ...rest} = d.data
if (properties.id === undefined) properties.id = `${source}_${target}`
const key = relation || kind
if (key && typeof key === 'string') {
if ( processed[key] === undefined) {
if (relation) edge_tabs.push(key)
else node_tabs.push(key)
const key = `edge_${relation}`

if (relation && typeof relation === 'string') {
if (processed[key] === undefined) {
edge_tabs.push(key)
processed[key] = {header: [], data: {}, columnVisibilityModel: {}}
const header = []
const columnVisibilityModel = {}
if (display[key]) {
for (const prop of display[key]) {

if (edgeDisplay[relation]) {
for (const prop of edgeDisplay[relation]) {
const field = prop.label
columnVisibilityModel[field] = !(prop.hide)
if (prop.type === "link") {
@@ -65,7 +168,6 @@ const NetworkTable = ({data, schema}: {data: NetworkSchema, schema: UISchema}) =
},
count: 0
})

} else {
header.push({
field,
@@ -78,41 +180,32 @@ const NetworkTable = ({data, schema}: {data: NetworkSchema, schema: UISchema}) =
})
}
}
} else if (typeof properties.id === 'string') {
const {id, symbol, ref, ...rest} = properties
id_mapper[id] = label
// header.push({
// field: 'id',
// headerName: "ID",
// flex: 1,
// style: {flexDirection: "row"},
// align: "left",
// type: relation ? "edge": "node",
// })
} else {
header.push({
field: 'label',
headerName: "Label",
flex: 1,
style: {flexDirection: "row"},
align: "left",
type: relation ? "edge": "node",
type: "edge",
})
for (const field of Object.keys(rest)) {
const headerName = field.replaceAll(".", " ")
header.push({
field,
headerName: headerName.charAt(0).toUpperCase() + headerName.slice(1),
// flex: 1,
style: {flexDirection: "row"},
align: "left",
type: relation ? "edge": "node",
type: "edge",
count: 0
})
}
}
processed[key].header = header
processed[key].columnVisibilityModel = columnVisibilityModel
}

// Process edge data
if (processed[key].data[properties.id] === undefined) {
processed[key].data[properties.id] = {id: properties.id}
}
@@ -135,15 +228,18 @@ const NetworkTable = ({data, schema}: {data: NetworkSchema, schema: UISchema}) =
}
}
}
if (processed[key].data[properties.id]["label"] === "") processed[key].data[properties.id]["label"] = label
}
if (processed[key].data[properties.id]["label"] === "") {
processed[key].data[properties.id]["label"] = label
}
}
}
// setMapper(id_mapper)

setTabs([...node_tabs, ...edge_tabs])
setTab(node_tabs[0])
setProcessedData(processed)
}
}, [data])

if (processedData === null) return null
else {
const {data={}, header=[], columnVisibilityModel} = processedData[tab] || {}
@@ -159,9 +255,12 @@ const NetworkTable = ({data, schema}: {data: NetworkSchema, schema: UISchema}) =
scrollButtons="auto"
onChange={(e, val)=>setTab(val)}
aria-label="tab"
sx={{
'& .MuiTab-root.Mui-selected': {color: '#336699',}
}}
>
{tabs.map(k=>(
<Tab value={k} aria-label="left aligned" key={`tab-${k}`} label={k}/>
<Tab value={k} aria-label="left aligned" key={`tab-${k}`} label={k.replace('node_', '').replace('edge_', '') + (k.startsWith('node_') ? ' nodes' : ' edges')}/>
))}
</Tabs>
</Grid>
@@ -202,4 +301,4 @@ const NetworkTable = ({data, schema}: {data: NetworkSchema, schema: UISchema}) =
}
}

export default NetworkTable
export default NetworkTable