Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion applications/sckanner/backend/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ pydantic==2.9.2
django-treebeard==4.7.1
django-ninja
pyontutils==0.1.38
neurondm==0.1.8
neurondm==0.1.10
jsonschema==4.24.0
h11>=0.16.0 # Fix CVE-2025-43859 (HTTP request smuggling vulnerability)
setuptools>=78.1.1 # Fix CVE-2025-47273 (path traversal vulnerability)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,11 @@ def fetch_paginated_data(population_ids: list[str], stdout=None):
return detailed_data


def get_statements(version="", stdout=None, a_b_via_c_json_file_path=None):
def get_statements(version="", **kwargs):
# Extract parameters from kwargs with defaults
stdout = kwargs.get('stdout', None)
a_b_via_c_json_file_path = kwargs.get('a_b_via_c_json_file_path', None)

try:
# Step 1: Load raw JSON from file or external source
if a_b_via_c_json_file_path:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1082,7 +1082,11 @@ def refine_statement(statement: Dict) -> Dict:

## Based on:
## https://github.com/tgbugs/pyontutils/blob/30c415207b11644808f70c8caecc0c75bd6acb0a/neurondm/docs/composer.py#L668-L698
def get_statements(version="", local=False, full_imports=[], label_imports=[]):
def get_statements(version="", **kwargs):
# Extract parameters from kwargs with defaults
local = kwargs.get('local', False)
full_imports = kwargs.get('full_imports', [])
label_imports = kwargs.get('label_imports', [])

config = Config('random-merge')
g = OntGraph() # load and query graph
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,13 @@ def _parse_and_validate_statements(

# Get statements from the uploaded module
if hasattr(module, "get_statements") and callable(module.get_statements):
# Pass the a_b_via_c_json_file path if available
a_b_via_c_json_file_path = None
# Prepare kwargs to pass to get_statements
kwargs = {}
if self.snapshot.a_b_via_c_json_file:
a_b_via_c_json_file_path = self.snapshot.a_b_via_c_json_file.path
kwargs['a_b_via_c_json_file_path'] = self.snapshot.a_b_via_c_json_file.path

statements = module.get_statements(
self.snapshot.version,
a_b_via_c_json_file_path=a_b_via_c_json_file_path
)
# Call get_statements with version and any additional kwargs
statements = module.get_statements(self.snapshot.version, **kwargs)
try:
# Validate the statements against the schema
current_path = os.path.dirname(os.path.abspath(__file__))
Expand Down
2 changes: 1 addition & 1 deletion applications/sckanner/backend/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from setuptools import find_packages, setup

NAME = "sckanner"
VERSION = "3.1.0"
VERSION = "3.1.1"

# To install the library, run the following
#
Expand Down
2 changes: 1 addition & 1 deletion applications/sckanner/deploy/values-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ harness:
mountpath: /usr/src/app/persistent
name: sckanner-ingestion-files
auto: true
size: 100Mi
size: 5Gi
usenfs: false
livenessProbe: {path: /api/live}
readinessProbe: {path: /api/ready}
Expand Down
2 changes: 1 addition & 1 deletion applications/sckanner/deploy/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ harness:
mountpath: /usr/src/app/persistent
name: sckanner-ingestion-files
auto: true
size: 100Mi
size: 1Gi
usenfs: false
livenessProbe: {path: /api/live}
readinessProbe: {path: /api/ready}
Expand Down
2 changes: 1 addition & 1 deletion applications/sckanner/frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "sckan-explorer",
"private": true,
"version": "3.1.0",
"version": "3.1.1",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down
2 changes: 1 addition & 1 deletion applications/sckanner/frontend/src/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export const STRINGS_NUMBERS = [
];

// Get version from Vite environment variable (set at build time)
export const SCKANNER_VERSION = import.meta.env.VITE_APP_VERSION || '3.1.0';
export const SCKANNER_VERSION = import.meta.env.VITE_APP_VERSION || '3.1.1';
export const COMPOSER_VERSION = '6.0.0';
export const NEURONDM_VERSION = '2025-10-27';
export const KNOWLEDGE_STATEMENTS_BATCH_SIZE = 15;