cognite-neat 0.75.8__py3-none-any.whl → 0.76.0__py3-none-any.whl

cognite/neat/_version.py

@@ -1 +1 @@
-__version__ = "0.75.8"
+__version__ = "0.76.0"

cognite/neat/app/api/configuration.py

@@ -7,8 +7,7 @@ from cognite.client import CogniteClient
 from fastapi import FastAPI
 
 from cognite import neat
-from cognite.neat.app.api.data_classes.configuration import Config, configure_logging
-from cognite.neat.config import copy_examples_to_directory, create_data_dir_structure
+from cognite.neat.config import Config, configure_logging, copy_examples_to_directory, create_data_dir_structure
 from cognite.neat.constants import PACKAGE_DIRECTORY
 from cognite.neat.utils.cdf import ServiceCogniteClient
 from cognite.neat.utils.utils import get_cognite_client_from_config, get_cognite_client_from_token
@@ -58,11 +57,7 @@ class NeatApp:
 
         self.workflow_manager = WorkflowManager(
             client=self.cdf_client,
-            registry_storage_type=self.config.workflows_store_type,
-            workflows_storage_path=self.config.workflows_store_path,
-            rules_storage_path=self.config.rules_store_path,
-            data_store_path=self.config.data_store_path,
-            data_set_id=self.config.cdf_default_dataset_id,
+            config=self.config,
         )
         self.workflow_manager.load_workflows_from_storage()
         self.triggers_manager = TriggerManager(workflow_manager=self.workflow_manager)
@@ -95,9 +90,9 @@ def create_neat_app() -> NeatApp:
         config.to_yaml(config_path)
 
     if config.load_examples:
-        copy_examples_to_directory(config.data_store_path)
+        copy_examples_to_directory(config)
     else:
-        create_data_dir_structure(config.data_store_path)
+        create_data_dir_structure(config)
 
     configure_logging(config.log_level, config.log_format)
     logging.info(f" Starting NEAT version {neat.__version__}")

cognite/neat/app/api/routers/configuration.py

@@ -4,7 +4,8 @@ from pathlib import Path
 
 from fastapi import APIRouter
 
-from cognite.neat.app.api.configuration import NEAT_APP, Config
+from cognite.neat.app.api.configuration import NEAT_APP
+from cognite.neat.config import Config
 
 router = APIRouter()
 

cognite/neat/app/api/routers/crud.py

@@ -7,7 +7,7 @@ import shutil
 from fastapi import APIRouter, UploadFile
 
 from cognite.neat.app.api.configuration import NEAT_APP
-from cognite.neat.app.api.data_classes.configuration import Config
+from cognite.neat.config import Config
 from cognite.neat.workflows.model import FlowMessage
 from cognite.neat.workflows.utils import get_file_hash
 
@@ -47,13 +47,13 @@ async def file_upload_handler(
     file_name = ""
     file_version = ""
     if file_type == "file_from_editor":
-        upload_dir = NEAT_APP.workflow_manager.data_store_path / "workflows" / workflow_name
+        upload_dir = NEAT_APP.workflow_manager.config.workflows_store_path / workflow_name
     elif file_type == "workflow":
-        upload_dir = NEAT_APP.workflow_manager.data_store_path / "workflows"
+        upload_dir = NEAT_APP.workflow_manager.config.workflows_store_path
     elif file_type == "staging":
-        upload_dir = NEAT_APP.workflow_manager.data_store_path / "staging"
+        upload_dir = NEAT_APP.workflow_manager.config.staging_path
     elif file_type == "source_graph":
-        upload_dir = NEAT_APP.workflow_manager.data_store_path / "source-graphs"
+        upload_dir = NEAT_APP.workflow_manager.config.source_graph_path
 
     for file in files:
         logging.info(

cognite/neat/app/api/routers/data_exploration.py

@@ -222,7 +222,9 @@ def execute_rule(request: RuleRequest):
         start_time = time.perf_counter()
         rules = cast(RulesData, workflow_context["RulesData"]).rules
         sparql_query = query_generator.build_sparql_query(
-            graph, request.rule, prefixes=rules.prefixes  # type: ignore[arg-type]
+            graph,  # type: ignore[arg-type]
+            request.rule,
+            prefixes=rules.prefixes,
         )
     else:
         logging.error("Unknown rule type")

cognite/neat/app/api/routers/rules.py

@@ -14,9 +14,9 @@ from cognite.neat.legacy.rules.models.rules import Class, Classes, Metadata, Pro
 from cognite.neat.rules import importers
 from cognite.neat.rules.models.rules import RoleTypes
 from cognite.neat.workflows.steps.data_contracts import RulesData
-from cognite.neat.workflows.steps.lib.rules_exporter import RulesToExcel
-from cognite.neat.workflows.steps.lib.rules_importer import ExcelToRules
-from cognite.neat.workflows.steps.lib.v1.rules_importer import ImportExcelToRules
+from cognite.neat.workflows.steps.lib.current.rules_exporter import RulesToExcel
+from cognite.neat.workflows.steps.lib.current.rules_importer import ExcelToRules
+from cognite.neat.workflows.steps.lib.legacy.rules_importer import ImportExcelToRules
 from cognite.neat.workflows.utils import get_file_hash
 
 router = APIRouter()

cognite/neat/app/api/routers/workflows.py

@@ -63,8 +63,8 @@ def package_workflow(workflow_name: str):
     if NEAT_APP.cdf_store is None:
         return {"error": "NeatApp is not initialized"}
     package_file = NEAT_APP.cdf_store.package_workflow(workflow_name)
-    hash = get_file_hash(NEAT_APP.config.data_store_path / "workflows" / package_file)
-    return {"package": package_file, "hash": hash}
+    hash_ = get_file_hash(NEAT_APP.config.workflows_store_path / package_file)
+    return {"package": package_file, "hash": hash_}
 
 
 @router.post("/api/workflow/context-cleanup/{workflow_name}")
@@ -249,7 +249,7 @@ async def upload_file(file: UploadFile, workflow_name: str):
     if NEAT_APP.workflow_manager is None or NEAT_APP.workflow_manager.data_store_path is None:
         return JSONResponse(content={"error": "Workflow Manager is not initialized"}, status_code=400)
     try:
-        upload_dir = NEAT_APP.workflow_manager.data_store_path / "workflows" / workflow_name
+        upload_dir = NEAT_APP.workflow_manager.config.workflows_store_path / workflow_name
         # Create a directory to store uploaded files if it doesn't exist
 
         # Define the file path where the uploaded file will be saved

cognite/neat/app/ui/neat-app/build/asset-manifest.json

@@ -1,14 +1,14 @@
 {
   "files": {
     "main.css": "./static/css/main.38a62222.css",
-    "main.js": "./static/js/main.4345d42f.js",
+    "main.js": "./static/js/main.ec7f72e2.js",
     "static/media/logo.svg": "./static/media/logo.8093b84df9ed36a174c629d6fe0b730d.svg",
     "index.html": "./index.html",
     "main.38a62222.css.map": "./static/css/main.38a62222.css.map",
-    "main.4345d42f.js.map": "./static/js/main.4345d42f.js.map"
+    "main.ec7f72e2.js.map": "./static/js/main.ec7f72e2.js.map"
   },
   "entrypoints": [
     "static/css/main.38a62222.css",
-    "static/js/main.4345d42f.js"
+    "static/js/main.ec7f72e2.js"
   ]
 }

cognite/neat/app/ui/neat-app/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./logo192.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="NEAT controll panel"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="manifest" href="./manifest.json"/><title>NEAT App</title><script defer="defer" src="./static/js/main.4345d42f.js"></script><link href="./static/css/main.38a62222.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./logo192.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="NEAT controll panel"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="manifest" href="./manifest.json"/><title>NEAT App</title><script defer="defer" src="./static/js/main.ec7f72e2.js"></script><link href="./static/css/main.38a62222.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>