Merge pull request #31 from nfdi4plants/processCore

ProcessCore querymodel

Author: HLWeil

build/BasicTasks.fs

@@ -148,15 +148,15 @@ let setPrereleaseTag() =
 let clean = BuildTask.create "Clean" [] {
     !! "src/**/bin"
     ++ "src/**/obj"
-    ++ "src/ARCtrl/ts/"
-    ++ "src/ARCtrl/py/"
+    ++ "src/ARCtrl.QueryModel/ts/"
+    ++ "src/ARCtrl.QueryModel/py/"
     ++ "tests/**/bin"
     ++ "tests/**/obj"
     ++ "tests/TestingUtils/TestResults"
     ++ "tests/**/py"
     ++ "tests/**/js"
-    ++ "tests/Javascript/ARCtrl"
-    ++ "tests/Python/ARCtrl"
+    ++ "tests/Javascript/ARCtrl.QueryModel"
+    ++ "tests/Python/ARCtrl.QueryModel"
     ++ "dist"
     ++ ProjectInfo.netPkgDir
     |> Shell.cleanDirs 

pyproject.toml

@@ -34,7 +34,7 @@ include = [
     "src/ARCtrl.Querymodel/py/**/*.py"
 ]
 packages = [
-    { include = "**/*.py", from = "src/ARCtrl.Querymodel/", to = "arctrl_querymodel" }
+    { include = "**/*.py", from = "src/ARCtrl.Querymodel/", to = "arcquerymodel" }
 ]
 
 [build-system]

src/ARCtrl.QueryModel/ARCtrl.QueryModel.Javascript.fsproj

@@ -28,6 +28,10 @@
     <Compile Include="Assay.fs" />
     <Compile Include="Study.fs" />
     <Compile Include="Investigation.fs" />
+    <Compile Include="ProcessCore\KnowledgeGraph.fs" />
+    <Compile Include="ProcessCore\PropertyValue.fs" />
+    <Compile Include="ProcessCore\ValueCollection.fs" />
+    <Compile Include="processcore\ProcessCollection.fs" />
     <!--<Compile Include="Linq\Helpers.fs" />
     <Compile Include="Linq\QueryBuilder.fs" />
     <Compile Include="Linq\Query.fs" />

src/ARCtrl.QueryModel/ARCtrl.QueryModel.Python.fsproj

@@ -28,6 +28,10 @@
     <Compile Include="Assay.fs" />
     <Compile Include="Study.fs" />
     <Compile Include="Investigation.fs" />
+    <Compile Include="ProcessCore\KnowledgeGraph.fs" />
+    <Compile Include="ProcessCore\PropertyValue.fs" />
+    <Compile Include="ProcessCore\ValueCollection.fs" />
+    <Compile Include="processcore\ProcessCollection.fs" />
     <!--<Compile Include="Linq\Helpers.fs" />
     <Compile Include="Linq\QueryBuilder.fs" />
     <Compile Include="Linq\Query.fs" />

src/ARCtrl.QueryModel/ARCtrl.QueryModel.fsproj

@@ -11,6 +11,8 @@
     <None Include="ARCtrl.QueryModel.Python.fsproj" />
     <None Include="ARCtrl.QueryModel.Javascript.fsproj" />
     <None Include="ARCtrl.QueryModel.Common.props" />
+    <None Include="index.ts" />
+    <None Include="__init__.py" />
     <Compile Include="ResizeArray.fs" />
     <Compile Include="OntologyAnnotation.fs" />
     <Compile Include="FragmentSelector.fs" />
@@ -27,6 +29,10 @@
     <Compile Include="Assay.fs" />
     <Compile Include="Study.fs" />
     <Compile Include="Investigation.fs" />
+    <Compile Include="ProcessCore\KnowledgeGraph.fs" />
+    <Compile Include="ProcessCore\PropertyValue.fs" />
+    <Compile Include="ProcessCore\ValueCollection.fs" />
+    <Compile Include="processcore\ProcessCollection.fs" />
     <Compile Include="Linq\Helpers.fs" />
     <Compile Include="Linq\QueryBuilder.fs" />
     <Compile Include="Linq\Query.fs" />

src/ARCtrl.QueryModel/ProcessCore/KnowledgeGraph.fs

@@ -0,0 +1,18 @@
+namespace ARCtrl.QueryModel.ProcessCore
+
+open ARCtrl.ROCrate
+open ARCtrl.QueryModel
+
+[<AutoOpen>]
+module KnowledgeGraph =
+
+    let objectOf = "objectOf"
+    let resultOf = "resultOf"
+
+    let context = 
+        LDContext(
+                baseContexts = ResizeArray[
+                    Context.initBioschemasContext()
+                    Context.initV1_2()
+                ]
+            )