oceanbox/Poseidon
6
0
Fork 0
Code Issues 48 Pull Requests 6 Actions Packages Projects Releases 149 Wiki Activity

Fix pipeline

Browse Source
This commit is contained in:
Simen Kirkvik
2025-11-26 15:52:38 +01:00
parent 65c29879ab
commit 95e6096fbb
20 changed files with 839 additions and 899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -30,7 +30,6 @@ _*.yaml
tilt/base/_manifest.yaml
NuGet.Config
sync.list
package-lock.json
*.nupkg
*.fable-temp*
.env
.env

3
Directory.Build.props
View File

@@ -26,11 +26,10 @@
<!-- Restore with Lockfiles -->
<!-- https://www.gresearch.co.uk/blog/article/improve-nuget-restores-with-static-graph-evaluation/ -->
<RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
<RestoreLockedMode Condition="'$(ContinuousIntegrationBuild)' == 'true'">true</RestoreLockedMode>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<!-- Performance -->
<ServerGarbageCollection>true</ServerGarbageCollection>
<OtherFlags>$(OtherFlags) --test:GraphBasedChecking --test:ParallelOptimization --test:ParallelIlxGen</OtherFlags>
</PropertyGroup>
</Project>
</Project>

1
Directory.Packages.props
View File

@@ -34,6 +34,7 @@
<PackageVersion Include="Fable.SimpleHttp" Version="3.6.0" />
<PackageVersion Include="Feliz.Router" Version="4.0.0"/>
<PackageVersion Include="Feliz" Version="2.9.0" />
<PackageVersion Include="Feliz.UseElmish" Version="2.5.0" />
<PackageVersion Include="Feliz.CompilerPlugins" Version="2.2.0" />
<PackageVersion Include="Matplotlib.ColorMaps" Version="3.0.1" />
<PackageVersion Include="Thoth.Fetch" Version="3.0.1" />

63
nix/packages/atlantis-client.nix
View File

@@ -5,14 +5,13 @@
deps,
fable,
version,
dotnet-sdk,
netrcConfig,
stdenvNoCC,
nodeModules,
nix-gitignore,
packageSources,
dotnet-sdk,
dotnet-runtime,
buildDotnetModule,
writableTmpDirAsHomeHook,
}:
let
root = ../../.;
@@ -22,60 +21,6 @@ let
pname = "Atlantis";
nodeDeps = stdenvNoCC.mkDerivation {
inherit version;
pname = "${pname}-node-deps";
nativeBuildInputs = [
bun
writableTmpDirAsHomeHook
];
src = lib.fileset.toSource {
inherit root;
fileset = lib.fileset.unions [
../../package.json
../../bun.lock
];
};
dontConfigure = true;
# Only install dependencies, don't build
buildPhase = ''
runHook preBuild
export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
# Disable post-install scripts to avoid shebang issues
bun install \
--frozen-lockfile \
--ignore-scripts \
--backend copyfile \
--no-progress \
--force
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out
cp -r node_modules $out/
runHook postInstall
'';
# Required else we get errors that our fixed-output derivation references store paths
dontFixup = true;
outputHashMode = "recursive";
outputHashAlgo = "sha256";
# NOTE: Empty this when a new dependency is added
outputHash = "sha256-T9X1EFeoNV3yKdVUIMOvaYtja6XR0fne6CDkKHD5rhE=";
};
in
buildDotnetModule {
inherit dotnet-sdk dotnet-runtime;
@@ -110,7 +55,7 @@ buildDotnetModule {
export HOME=$TMPDIR
cp -r ${nodeDeps}/node_modules ./.
cp -r ${nodeModules}/node_modules ./.
chmod -R u+rw node_modules
chmod -R u+x node_modules/.bin
@@ -141,4 +86,4 @@ buildDotnetModule {
dontFixup = true;
dontPatchELF = true;
dontStrip = true;
}
}

3
nix/packages/default.nix
View File

@@ -93,9 +93,10 @@ in
atlantis-client = pkgs.callPackage ./atlantis-client.nix {
inherit
deps
netrcConfig
version
dotnet-sdk
netrcConfig
nodeModules
dotnet-runtime
packageSources
;

6
src/Archivist/src/Cli/AclCli.fs
View File

@@ -74,7 +74,11 @@ let addUsers (args: PrincipalArgs) =
async {
try
match! aclApi.addUsers users with
let req : Archmaester.AddUsersRequest = {
group = ""
users = users
}
match! aclApi.addUsers req with
| Ok _ ->
Log.Information $"Added users %A{users}"
return Ok ()

3
src/Atlantis/src/Client/Client.fsproj
View File

@@ -4,7 +4,6 @@
<TargetFramework>net9.0</TargetFramework>
<DefineConstants>FABLE_COMPILER</DefineConstants>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<Version>2.102.0</Version>
<LangVersion>preview</LangVersion>
<RootNamespace>Main</RootNamespace>
@@ -25,4 +24,4 @@
<ProjectReference Include="Atlas\Atlas.fsproj" />
<ProjectReference Include="Mapster\Mapster.fsproj" />
</ItemGroup>
</Project>
</Project>

3
src/Atlantis/src/Client/packages.lock.json
View File

@@ -715,7 +715,6 @@
"Fable.Core": "4.1.0"
}
}
},
"net9.0/linux-x64": {}
}
}
}

3
src/Atlantis/src/Server/Server.fsproj
View File

@@ -4,7 +4,6 @@
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<Version>2.102.0</Version>
<RootNamespace>Server</RootNamespace>
</PropertyGroup>
@@ -69,4 +68,4 @@
<ProjectReference Include="Hipster\Hipster.fsproj" />
<ProjectReference Include="Archmaester\Archmaester.fsproj" />
</ItemGroup>
</Project>
</Project>

24
src/Atlantis/src/Server/packages.lock.json
View File

@@ -1520,7 +1520,7 @@
"Fable.Remoting.Server": "[5.39.0, )",
"Giraffe": "[7.0.2, )",
"Npgsql": "[9.0.2, )",
"Oceanbox.DataAgent": "[7.2.1, )",
"Oceanbox.DataAgent": "[7.3.0, )",
"Oceanbox.DataAgent.Api": "[7.2.1, )",
"Serilog": "[4.2.0, )"
}
@@ -1543,9 +1543,9 @@
"Drifters.Api": "[6.22.0, )",
"FSharp.Core": "[9.0.303, )",
"Hipster.Api": "[1.0.1, )",
"Oceanbox.DataAgent": "[7.2.1, )",
"Oceanbox.DataAgent": "[7.3.0, )",
"Oceanbox.DataAgent.Api": "[7.2.1, )",
"Oceanbox.ServerPack": "[1.30.1, )",
"Oceanbox.ServerPack": "[1.33.0, )",
"Petimeter.Api": "[1.0.0, )"
}
},
@@ -1814,24 +1814,6 @@
"Serilog": "4.0.0"
}
}
},
"net9.0/linux-x64": {
"System.Text.Encodings.Web": {
"type": "Direct",
"requested": "[9.0.2, )",
"resolved": "9.0.2",
"contentHash": "/kCGdrXg0PXrvkHYyHubXJHcmCAvJrxTZ7g4XS6UCxY1JW79aMjtUW6UYNECHJmiyFZsZ/vUuWOM4CtNpiNt8Q=="
},
"System.Security.Cryptography.Pkcs": {
"type": "Transitive",
"resolved": "9.0.2",
"contentHash": "aC9IlCbgompuyQUixa03yEq/fGDLwsSn1tiqFsk/hMDTSxcdf1Ha77SfDgdguLx+sAsuHWAkiXgveDsHdw5bdA=="
},
"System.Security.Cryptography.ProtectedData": {
"type": "Transitive",
"resolved": "4.5.0",
"contentHash": "wLBKzFnDCxP12VL9ANydSYhk59fC4cvOr9ypYQLPnAj48NQIhqnjdD2yhP8yEKyBJEjERWS9DisKL7rX5eU25Q=="
}
}
}
}

19
src/Codex/src/Client/Codex.Client.fsproj
View File

@@ -2,6 +2,8 @@
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>Oceanbox</RootNamespace>
<Version>0.0.0-alpha.1</Version>
<DefineConstants>FABLE_COMPILER</DefineConstants>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
</PropertyGroup>
<ItemGroup>
@@ -46,17 +48,18 @@
<None Include="index.html" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Fable.OpenLayers" Version="2.20.0" />
<PackageReference Include="Fable.Promise" Version="3.2.0" />
<PackageReference Include="Fable.Remoting.Client" Version="7.35.0" />
<PackageReference Include="Feliz" Version="2.9.0" />
<PackageReference Include="Feliz.Router" Version="4.0.0" />
<PackageReference Include="Feliz.UseElmish" Version="2.5.0" />
<PackageReference Include="FsToolkit.ErrorHandling" Version="5.1.0" />
<PackageReference Include="Fable.Core" />
<PackageReference Include="Fable.OpenLayers" />
<PackageReference Include="Fable.Promise" />
<PackageReference Include="Fable.Remoting.Client" />
<PackageReference Include="Feliz" />
<PackageReference Include="Feliz.Router" />
<PackageReference Include="Feliz.UseElmish" />
<PackageReference Include="FsToolkit.ErrorHandling" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Interfaces\Archmaester\Archmaester.Api.fsproj" />
<ProjectReference Include="..\..\..\Interfaces\Atlantis\Atlantis.Api.fsproj" />
<ProjectReference Include="..\..\..\Atlantis\src\Client\Lib\Lib.fsproj" />
</ItemGroup>
</Project>
</Project>

2
src/Codex/src/Client/default.nix
View File

@@ -56,7 +56,7 @@ buildDotnetModule {
pushd src/Codex/src/Client
${lib.getExe fable} --verbose -e .jsx -o build
${lib.getExe bun} ../../../../node_modules/.bin/vite build -d
${lib.getExe bun} ../../../../node_modules/.bin/vite build -d --mode production
popd
mv src/Codex/src/Client/dist .

469
src/Codex/src/Client/packages.lock.json
View File

@@ -1,12 +1,18 @@
{
"version": 1,
"version": 2,
"dependencies": {
"net9.0": {
"Fable.Core": {
"type": "Direct",
"requested": "[4.4.0, )",
"resolved": "4.4.0",
"contentHash": "zVQdiC8RqCOBb3KACTp9ASU9Q46esXXWosZQT/Vu/RhCpkfVwXPmBxVayy3iyqaRWc7XSu4Af7pbOqlcL/RtdA=="
},
"Fable.OpenLayers": {
"type": "Direct",
"requested": "[2.20.0, )",
"resolved": "2.20.0",
"contentHash": "FB3JH7UTSgFwyA9l8/B7QkN1G3uHb4g9h3Nyh//wFBFvDlGFqd+Pet4Fp3XLrwJaHl3hUWz7BKZOQLdcw1EKBA==",
"requested": "[2.19.0, )",
"resolved": "2.19.0",
"contentHash": "zVwnqj8LHHUVuw4loS88ZvFCYILKDtG/NWzhGOLwZ5yqj+pRxlD6Mex7zsGrSc08y3P/D/LLdjKmJuE/Nbgo6Q==",
"dependencies": {
"FSharp.Core": "9.0.303",
"Fable.Browser.Dom": "2.18.0",
@@ -26,14 +32,14 @@
},
"Fable.Remoting.Client": {
"type": "Direct",
"requested": "[7.35.0, )",
"resolved": "7.35.0",
"contentHash": "57StsvefN9NZorEbOsjngDXjn0JDxDG36S8ikDQdAC/WTi5n7kZChZ1v+0CMiZ2IU9aarprOLvr1ie5NKN9IZA==",
"requested": "[7.32.0, )",
"resolved": "7.32.0",
"contentHash": "PMZ0gj8UXXBKrLg71IwGGTMmy2woSdesjFYkrkDNYmhNDvz3Z/h05fJYOVXYYKXp/d2XRX0fHtGV0DuYppip7A==",
"dependencies": {
"FSharp.Core": "4.7.2",
"Fable.Browser.XMLHttpRequest": "1.0.0",
"Fable.Core": "3.1.5",
"Fable.Remoting.MsgPack": "1.25.0",
"Fable.Remoting.MsgPack": "1.24.0",
"Fable.SimpleJson": "3.24.0"
}
},
@@ -69,61 +75,15 @@
"Fable.Elmish": "4.0.0"
}
},
"FSharp.Core": {
"type": "Direct",
"requested": "[9.0.303, )",
"resolved": "9.0.303",
"contentHash": "6JlV8aD8qQvcmfoe/PMOxCHXc0uX4lR23u0fAyQtnVQxYULLoTZgwgZHSnRcuUHOvS3wULFWcwdnP1iwslH60g=="
},
"FsToolkit.ErrorHandling": {
"type": "Direct",
"requested": "[5.1.0, )",
"resolved": "5.1.0",
"contentHash": "l1bblQhBLLjoHVVxnxDghT8DBjeDQoN1UEEwryvfAoer599C/hnOo0BPcNVP1SpltaWXTjdUZXZyXj0jF6Onbw==",
"requested": "[5.0.1, )",
"resolved": "5.0.1",
"contentHash": "93oG3WSogK05H4gkikAmx5pBf30TQJfO1Jky+o/N/nv+RTP3nfOfjlmCHzuyUjQCRFOQog/xQabcky+WBWceeQ==",
"dependencies": {
"FSharp.Core": "9.0.300"
}
},
"Dapr.Actors": {
"type": "Transitive",
"resolved": "1.16.0",
"contentHash": "s9v6VofXXYoRqZJQlQbvNYYSlGhkL+Z+bpqrx1TRo06kLhANeDmXA9yeVaD+1KwJIO1chUFj5O4iKuTxIkg1sA==",
"dependencies": {
"Dapr.Client": "1.16.0",
"Dapr.Common": "1.16.0",
"Google.Api.CommonProtos": "2.17.0",
"Google.Protobuf": "3.32.0",
"Grpc.Net.Client": "2.71.0",
"Microsoft.Extensions.Configuration": "9.0.8",
"Microsoft.Extensions.Configuration.Abstractions": "9.0.8",
"Microsoft.Extensions.DependencyInjection": "9.0.8",
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.8",
"Microsoft.Extensions.Http": "9.0.8",
"Microsoft.Extensions.Logging": "9.0.8",
"Microsoft.Extensions.Logging.Abstractions": "9.0.8",
"Microsoft.Extensions.Options": "9.0.8"
}
},
"Dapr.Client": {
"type": "Transitive",
"resolved": "1.16.0",
"contentHash": "dFDKol+mtQrk1lIKlEyCx3k6W0Pf+0wC6xcsaDqa0Bg+XCWDc4juROuDcSb0/L1Y+Ev6LSLDMC/FgzNWMw9YtQ==",
"dependencies": {
"Dapr.Common": "1.16.0",
"Dapr.Protos": "1.16.0",
"Google.Api.CommonProtos": "2.17.0",
"Google.Protobuf": "3.32.0",
"Grpc.Net.Client": "2.71.0",
"Microsoft.Extensions.Configuration": "9.0.8",
"Microsoft.Extensions.Configuration.Abstractions": "9.0.8",
"Microsoft.Extensions.DependencyInjection": "9.0.8",
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.8",
"Microsoft.Extensions.Http": "9.0.8",
"Microsoft.Extensions.Logging": "9.0.8",
"Microsoft.Extensions.Logging.Abstractions": "9.0.8",
"Microsoft.Extensions.Options": "9.0.8"
}
},
"Dapr.Common": {
"type": "Transitive",
"resolved": "1.16.0",
@@ -155,14 +115,6 @@
"Microsoft.Extensions.Logging.Abstractions": "9.0.8"
}
},
"Drifters.Api": {
"type": "Transitive",
"resolved": "6.22.0",
"contentHash": "EQguKE22Tfd3ayO/jdWiWMBK5R1uzcYo+8agG3ZzAJ1ltl72mIXHqr68BKqO4uhOLtiFs8ErZa4cZ9NVueYHWA==",
"dependencies": {
"FSharp.Core": "9.0.201"
}
},
"Fable.AST": {
"type": "Transitive",
"resolved": "4.2.1",
@@ -208,28 +160,6 @@
"Fable.Core": "3.2.8"
}
},
"Fable.Browser.IndexedDB": {
"type": "Transitive",
"resolved": "2.2.0",
"contentHash": "6RU8aqUeb4qpAekPEjnpaWP+RRTyYMB4ICE06eZoMoTXPq0oGWxsEkHPgDJIPVTmyDuAGJ4YMcDCt2D8850xMw==",
"dependencies": {
"FSharp.Core": "4.7.2",
"Fable.Browser.Dom": "2.14.0",
"Fable.Browser.Event": "1.5.0",
"Fable.Core": "3.2.8"
}
},
"Fable.Browser.WebGL": {
"type": "Transitive",
"resolved": "1.3.0",
"contentHash": "iQognakmr62KccqZg++oenn1J0eSdCexAFUII0fSWAz1tTfdaPxrFKIjagHd/3HWw5NettpyNJREVRDghklYTQ==",
"dependencies": {
"FSharp.Core": "4.7.2",
"Fable.Browser.Dom": "2.16.0",
"Fable.Browser.Event": "1.6.0",
"Fable.Core": "3.2.8"
}
},
"Fable.Browser.WebStorage": {
"type": "Transitive",
"resolved": "1.3.0",
@@ -251,61 +181,6 @@
"Fable.Core": "3.0.0"
}
},
"Fable.Core": {
"type": "Transitive",
"resolved": "4.4.0",
"contentHash": "zVQdiC8RqCOBb3KACTp9ASU9Q46esXXWosZQT/Vu/RhCpkfVwXPmBxVayy3iyqaRWc7XSu4Af7pbOqlcL/RtdA=="
},
"Fable.Elmish": {
"type": "Transitive",
"resolved": "4.2.0",
"contentHash": "A8lDcHbz2AKcwFa6IlnK8I/21nbsxBcP5Vxq6Gp+jT8dU7Vjpnk8Pbry5+zQrlqjwt1XHU/S5Oo0KZqaGemPUA==",
"dependencies": {
"FSharp.Core": "4.7.2",
"Fable.Core": "3.7.1"
}
},
"Fable.Fetch": {
"type": "Transitive",
"resolved": "2.7.0",
"contentHash": "2ndGZZTqpX9Hyso51tnIxWAskN2zrHX+7LeAwfG4zew+DtMMGa/3IyJGl2BOYUwweq2MhfuVqs1K3avgBFDq+Q==",
"dependencies": {
"FSharp.Core": "4.7.2",
"Fable.Browser.Blob": "1.2.0",
"Fable.Browser.Event": "1.5.0",
"Fable.Core": "3.7.1",
"Fable.Promise": "2.2.2"
}
},
"Fable.Lit": {
"type": "Transitive",
"resolved": "1.6.2-oceanbox",
"contentHash": "ylo6UgB6FiGyINpDvryYt3GPl8MH6fvB5tiNizCmsNNerGxw/THFMGGJHmukQDh64NHru4ARhPTPgkBvsyOTVA==",
"dependencies": {
"FSharp.Core": "8.0.300",
"Fable.Browser.Dom": "2.17.0",
"Fable.Core": "4.3.0",
"Fable.Promise": "3.2.0"
}
},
"Fable.Lit.Elmish": {
"type": "Transitive",
"resolved": "1.6.2-oceanbox",
"contentHash": "K0fBlpHWZs07s3OYcpBZXVo+xoot62f+USdw8Pi9yxd8a6rmfsbbPlDQvGe2k6VpkEelXNL0AMwEt9GxEY1DeQ==",
"dependencies": {
"Fable.Elmish": "4.2.0",
"Fable.Lit": "1.6.2-oceanbox"
}
},
"Fable.Lit.React": {
"type": "Transitive",
"resolved": "1.6.2-oceanbox",
"contentHash": "+k0/F4mWZe91GuPDJxBTawUFKegQyNU48OjwAQTzzp3RlibCo1wvFtZjISJz83OvHcjuCSmO02i7uxWm9j6gFw==",
"dependencies": {
"Fable.Lit": "1.6.2-oceanbox",
"Feliz": "2.8.0"
}
},
"Fable.Parsimmon": {
"type": "Transitive",
"resolved": "4.0.0",
@@ -315,16 +190,6 @@
"Fable.Core": "3.0.0"
}
},
"Fable.React": {
"type": "Transitive",
"resolved": "9.4.0",
"contentHash": "c33FD2BumoYvu4/8bz2ToWaLZyfq2GMo7nq0RB/Bdoj7KdNObNBw2s1jWTi9whcf/s3tmikoXS4gZUKpD9MJ8g==",
"dependencies": {
"FSharp.Core": "4.7.2",
"Fable.React.Types": "18.3.0",
"Fable.ReactDom.Types": "18.2.0"
}
},
"Fable.React.Types": {
"type": "Transitive",
"resolved": "18.3.0",
@@ -344,14 +209,6 @@
"Fable.React.Types": "18.3.0"
}
},
"Fable.Remoting.MsgPack": {
"type": "Transitive",
"resolved": "1.25.0",
"contentHash": "FyqSj8j8J0W7xTR8XJmk2Q6vZa0NlKUUjQtr/rQhCkV2r5uJ3gtT+2KSiMjdzemwV5X+9eUz6C5q1YN0t3ccug==",
"dependencies": {
"FSharp.Core": "4.7.2"
}
},
"Fable.SignalR": {
"type": "Transitive",
"resolved": "2.1.0",
@@ -363,28 +220,6 @@
"Fable.SimpleJson": "3.24.0"
}
},
"Fable.SignalR.Elmish": {
"type": "Transitive",
"resolved": "2.1.0",
"contentHash": "sPPuEcpKlRGACbX7Hk4kh31+aii8GAM8toTwYpmrtU+Zl9QocwbWK6nPJaE0YbQ41ZJgohyU6bNhKt7+SPKZhw==",
"dependencies": {
"FSharp.Core": "9.0.100",
"Fable.Elmish": "4.2.0",
"Fable.Promise": "3.2.0",
"Fable.SignalR": "2.1.0"
}
},
"Fable.SimpleHttp": {
"type": "Transitive",
"resolved": "3.6.0",
"contentHash": "RHXu3OQVxoxObErhUWl7J9JWXqDxLaQrpIXyo2MECF1a9ekNZ5bBnDGVB1RCEKRpVFB6SOun/pk+DB5wJDYmmg==",
"dependencies": {
"FSharp.Core": "4.6.2",
"Fable.Browser.Dom": "1.0.0",
"Fable.Browser.XMLHttpRequest": "1.1.0",
"Fable.Core": "3.0.0"
}
},
"Fable.SimpleJson": {
"type": "Transitive",
"resolved": "3.24.0",
@@ -395,15 +230,6 @@
"Fable.Parsimmon": "4.0.0"
}
},
"Feliz.CompilerPlugins": {
"type": "Transitive",
"resolved": "2.2.0",
"contentHash": "ACkO++Hp4lUrEx/axeehIL5/3R8jMnak+CYpzd0/kLpejp9BETtrgjHK7oj6Lh3V9fB7WoAKsCxyPSrm4ADN2w==",
"dependencies": {
"FSharp.Core": "4.7.2",
"Fable.AST": "4.2.1"
}
},
"Google.Api.CommonProtos": {
"type": "Transitive",
"resolved": "2.17.0",
@@ -439,14 +265,6 @@
"Grpc.Core.Api": "2.71.0"
}
},
"Matplotlib.ColorMaps": {
"type": "Transitive",
"resolved": "3.0.1",
"contentHash": "Amw/NumOXIOB4Z/YbBErDd7gcZrtNhG10aeF9MydXUVNmmf7BJKeHDroSnzMRbsUOf3oQCXhzyjng6mhmRA0LA==",
"dependencies": {
"FSharp.Core": "6.0.4"
}
},
"Microsoft.Extensions.Configuration": {
"type": "Transitive",
"resolved": "9.0.8",
@@ -561,31 +379,10 @@
"resolved": "9.0.8",
"contentHash": "tizSIOEsIgSNSSh+hKeUVPK7xmTIjR8s+mJWOu1KXV3htvNQiPMFRMO17OdI1y/4ZApdBVk49u/08QGC9yvLug=="
},
"Thoth.Fetch": {
"type": "Transitive",
"resolved": "3.0.1",
"contentHash": "5i8KQwTFzDEoIjE/fAwCw0GFICCsFzVkVq2w4uU1fRlOqbSfLlUNcCEq6JkeAvQ+Jj7syMKNPSH994T8NswcpA==",
"dependencies": {
"FSharp.Core": "4.7.2",
"Fable.Core": "3.2.8",
"Fable.Fetch": "2.1.0",
"Fable.Promise": "2.0.0",
"Thoth.Json": "6.0.0"
}
},
"Thoth.Json": {
"type": "Transitive",
"resolved": "10.4.1",
"contentHash": "hs76/uO+gHhvnlaxQDqbpUX2Y0L97ilEZ1Nx+LA4D6N7fuAYJmNwQWZB/KQLBE7wIeWK5oXMFHCuKdImSrF1Bg==",
"dependencies": {
"FSharp.Core": "5.0.2",
"Fable.Core": "4.1.0"
}
},
"atlantis.api": {
"type": "Project",
"dependencies": {
"FSharp.Core": "[9.0.201, )",
"FSharp.Core": "[9.0.303, )",
"Hipster.Api": "[1.0.1, )",
"Petimeter.Api": "[1.0.0, )"
}
@@ -595,7 +392,7 @@
"dependencies": {
"Dapr.Actors": "[1.16.0, )",
"Drifters.Api": "[6.22.0, )",
"FSharp.Core": "[9.0.201, )"
"FSharp.Core": "[9.0.303, )"
}
},
"lib": {
@@ -633,23 +430,245 @@
"Oceanbox.DataAgent.Api": {
"type": "Project",
"dependencies": {
"FSharp.Core": "[9.0.201, )"
"FSharp.Core": "[9.0.303, )"
}
},
"petimeter.api": {
"type": "Project",
"dependencies": {
"Dapr.Actors": "[1.16.0, )",
"FSharp.Core": "[9.0.201, )"
"FSharp.Core": "[9.0.303, )"
}
},
"sorcerer.api": {
"type": "Project",
"dependencies": {
"Drifters.Api": "[6.22.0, )",
"FSharp.Core": "[9.0.201, )",
"FSharp.Core": "[9.0.303, )",
"Oceanbox.DataAgent.Api": "[7.2.1, )"
}
},
"Dapr.Actors": {
"type": "CentralTransitive",
"requested": "[1.16.0, )",
"resolved": "1.16.0",
"contentHash": "s9v6VofXXYoRqZJQlQbvNYYSlGhkL+Z+bpqrx1TRo06kLhANeDmXA9yeVaD+1KwJIO1chUFj5O4iKuTxIkg1sA==",
"dependencies": {
"Dapr.Client": "1.16.0",
"Dapr.Common": "1.16.0",
"Google.Api.CommonProtos": "2.17.0",
"Google.Protobuf": "3.32.0",
"Grpc.Net.Client": "2.71.0",
"Microsoft.Extensions.Configuration": "9.0.8",
"Microsoft.Extensions.Configuration.Abstractions": "9.0.8",
"Microsoft.Extensions.DependencyInjection": "9.0.8",
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.8",
"Microsoft.Extensions.Http": "9.0.8",
"Microsoft.Extensions.Logging": "9.0.8",
"Microsoft.Extensions.Logging.Abstractions": "9.0.8",
"Microsoft.Extensions.Options": "9.0.8"
}
},
"Dapr.Client": {
"type": "CentralTransitive",
"requested": "[1.16.0, )",
"resolved": "1.16.0",
"contentHash": "dFDKol+mtQrk1lIKlEyCx3k6W0Pf+0wC6xcsaDqa0Bg+XCWDc4juROuDcSb0/L1Y+Ev6LSLDMC/FgzNWMw9YtQ==",
"dependencies": {
"Dapr.Common": "1.16.0",
"Dapr.Protos": "1.16.0",
"Google.Api.CommonProtos": "2.17.0",
"Google.Protobuf": "3.32.0",
"Grpc.Net.Client": "2.71.0",
"Microsoft.Extensions.Configuration": "9.0.8",
"Microsoft.Extensions.Configuration.Abstractions": "9.0.8",
"Microsoft.Extensions.DependencyInjection": "9.0.8",
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.8",
"Microsoft.Extensions.Http": "9.0.8",
"Microsoft.Extensions.Logging": "9.0.8",
"Microsoft.Extensions.Logging.Abstractions": "9.0.8",
"Microsoft.Extensions.Options": "9.0.8"
}
},
"Drifters.Api": {
"type": "CentralTransitive",
"requested": "[6.22.0, )",
"resolved": "6.22.0",
"contentHash": "EQguKE22Tfd3ayO/jdWiWMBK5R1uzcYo+8agG3ZzAJ1ltl72mIXHqr68BKqO4uhOLtiFs8ErZa4cZ9NVueYHWA==",
"dependencies": {
"FSharp.Core": "9.0.201"
}
},
"Fable.Browser.IndexedDB": {
"type": "CentralTransitive",
"requested": "[2.2.0, )",
"resolved": "2.2.0",
"contentHash": "6RU8aqUeb4qpAekPEjnpaWP+RRTyYMB4ICE06eZoMoTXPq0oGWxsEkHPgDJIPVTmyDuAGJ4YMcDCt2D8850xMw==",
"dependencies": {
"FSharp.Core": "4.7.2",
"Fable.Browser.Dom": "2.14.0",
"Fable.Browser.Event": "1.5.0",
"Fable.Core": "3.2.8"
}
},
"Fable.Browser.WebGL": {
"type": "CentralTransitive",
"requested": "[1.3.0, )",
"resolved": "1.3.0",
"contentHash": "iQognakmr62KccqZg++oenn1J0eSdCexAFUII0fSWAz1tTfdaPxrFKIjagHd/3HWw5NettpyNJREVRDghklYTQ==",
"dependencies": {
"FSharp.Core": "4.7.2",
"Fable.Browser.Dom": "2.16.0",
"Fable.Browser.Event": "1.6.0",
"Fable.Core": "3.2.8"
}
},
"Fable.Elmish": {
"type": "CentralTransitive",
"requested": "[4.2.0, )",
"resolved": "4.2.0",
"contentHash": "A8lDcHbz2AKcwFa6IlnK8I/21nbsxBcP5Vxq6Gp+jT8dU7Vjpnk8Pbry5+zQrlqjwt1XHU/S5Oo0KZqaGemPUA==",
"dependencies": {
"FSharp.Core": "4.7.2",
"Fable.Core": "3.7.1"
}
},
"Fable.Fetch": {
"type": "CentralTransitive",
"requested": "[2.7.0, )",
"resolved": "2.7.0",
"contentHash": "2ndGZZTqpX9Hyso51tnIxWAskN2zrHX+7LeAwfG4zew+DtMMGa/3IyJGl2BOYUwweq2MhfuVqs1K3avgBFDq+Q==",
"dependencies": {
"FSharp.Core": "4.7.2",
"Fable.Browser.Blob": "1.2.0",
"Fable.Browser.Event": "1.5.0",
"Fable.Core": "3.7.1",
"Fable.Promise": "2.2.2"
}
},
"Fable.Lit": {
"type": "CentralTransitive",
"requested": "[1.6.2-oceanbox, )",
"resolved": "1.6.2-oceanbox",
"contentHash": "ylo6UgB6FiGyINpDvryYt3GPl8MH6fvB5tiNizCmsNNerGxw/THFMGGJHmukQDh64NHru4ARhPTPgkBvsyOTVA==",
"dependencies": {
"FSharp.Core": "8.0.300",
"Fable.Browser.Dom": "2.17.0",
"Fable.Core": "4.3.0",
"Fable.Promise": "3.2.0"
}
},
"Fable.Lit.Elmish": {
"type": "CentralTransitive",
"requested": "[1.6.2-oceanbox, )",
"resolved": "1.6.2-oceanbox",
"contentHash": "K0fBlpHWZs07s3OYcpBZXVo+xoot62f+USdw8Pi9yxd8a6rmfsbbPlDQvGe2k6VpkEelXNL0AMwEt9GxEY1DeQ==",
"dependencies": {
"Fable.Elmish": "4.2.0",
"Fable.Lit": "1.6.2-oceanbox"
}
},
"Fable.Lit.React": {
"type": "CentralTransitive",
"requested": "[1.6.2-oceanbox, )",
"resolved": "1.6.2-oceanbox",
"contentHash": "+k0/F4mWZe91GuPDJxBTawUFKegQyNU48OjwAQTzzp3RlibCo1wvFtZjISJz83OvHcjuCSmO02i7uxWm9j6gFw==",
"dependencies": {
"Fable.Lit": "1.6.2-oceanbox",
"Feliz": "2.8.0"
}
},
"Fable.React": {
"type": "CentralTransitive",
"requested": "[9.4.0, )",
"resolved": "9.4.0",
"contentHash": "c33FD2BumoYvu4/8bz2ToWaLZyfq2GMo7nq0RB/Bdoj7KdNObNBw2s1jWTi9whcf/s3tmikoXS4gZUKpD9MJ8g==",
"dependencies": {
"FSharp.Core": "4.7.2",
"Fable.React.Types": "18.3.0",
"Fable.ReactDom.Types": "18.2.0"
}
},
"Fable.Remoting.MsgPack": {
"type": "CentralTransitive",
"requested": "[1.24.0, )",
"resolved": "1.24.0",
"contentHash": "Bn3nzoZbib6lPk70bIJumEu2wFMxciB4o8k0Zw6tRfAOpNKvUsi79OOll2nW3FU1P6MVBepT43m+R8JvfYnNiw==",
"dependencies": {
"FSharp.Core": "4.7.2"
}
},
"Fable.SignalR.Elmish": {
"type": "CentralTransitive",
"requested": "[2.1.0, )",
"resolved": "2.1.0",
"contentHash": "sPPuEcpKlRGACbX7Hk4kh31+aii8GAM8toTwYpmrtU+Zl9QocwbWK6nPJaE0YbQ41ZJgohyU6bNhKt7+SPKZhw==",
"dependencies": {
"FSharp.Core": "9.0.100",
"Fable.Elmish": "4.2.0",
"Fable.Promise": "3.2.0",
"Fable.SignalR": "2.1.0"
}
},
"Fable.SimpleHttp": {
"type": "CentralTransitive",
"requested": "[3.6.0, )",
"resolved": "3.6.0",
"contentHash": "RHXu3OQVxoxObErhUWl7J9JWXqDxLaQrpIXyo2MECF1a9ekNZ5bBnDGVB1RCEKRpVFB6SOun/pk+DB5wJDYmmg==",
"dependencies": {
"FSharp.Core": "4.6.2",
"Fable.Browser.Dom": "1.0.0",
"Fable.Browser.XMLHttpRequest": "1.1.0",
"Fable.Core": "3.0.0"
}
},
"Feliz.CompilerPlugins": {
"type": "CentralTransitive",
"requested": "[2.2.0, )",
"resolved": "2.2.0",
"contentHash": "ACkO++Hp4lUrEx/axeehIL5/3R8jMnak+CYpzd0/kLpejp9BETtrgjHK7oj6Lh3V9fB7WoAKsCxyPSrm4ADN2w==",
"dependencies": {
"FSharp.Core": "4.7.2",
"Fable.AST": "4.2.1"
}
},
"FSharp.Core": {
"type": "CentralTransitive",
"requested": "[9.0.303, )",
"resolved": "9.0.303",
"contentHash": "6JlV8aD8qQvcmfoe/PMOxCHXc0uX4lR23u0fAyQtnVQxYULLoTZgwgZHSnRcuUHOvS3wULFWcwdnP1iwslH60g=="
},
"Matplotlib.ColorMaps": {
"type": "CentralTransitive",
"requested": "[3.0.1, )",
"resolved": "3.0.1",
"contentHash": "Amw/NumOXIOB4Z/YbBErDd7gcZrtNhG10aeF9MydXUVNmmf7BJKeHDroSnzMRbsUOf3oQCXhzyjng6mhmRA0LA==",
"dependencies": {
"FSharp.Core": "6.0.4"
}
},
"Thoth.Fetch": {
"type": "CentralTransitive",
"requested": "[3.0.1, )",
"resolved": "3.0.1",
"contentHash": "5i8KQwTFzDEoIjE/fAwCw0GFICCsFzVkVq2w4uU1fRlOqbSfLlUNcCEq6JkeAvQ+Jj7syMKNPSH994T8NswcpA==",
"dependencies": {
"FSharp.Core": "4.7.2",
"Fable.Core": "3.2.8",
"Fable.Fetch": "2.1.0",
"Fable.Promise": "2.0.0",
"Thoth.Json": "6.0.0"
}
},
"Thoth.Json": {
"type": "CentralTransitive",
"requested": "[10.4.1, )",
"resolved": "10.4.1",
"contentHash": "hs76/uO+gHhvnlaxQDqbpUX2Y0L97ilEZ1Nx+LA4D6N7fuAYJmNwQWZB/KQLBE7wIeWK5oXMFHCuKdImSrF1Bg==",
"dependencies": {
"FSharp.Core": "5.0.2",
"Fable.Core": "4.1.0"
}
}
}
}

18
src/Codex/src/Server/Codex.Server.fsproj
View File

@@ -3,19 +3,19 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<EnableDefaultContentItems>false</EnableDefaultContentItems>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<PackageId>Codex.Server</PackageId>
<RootNamespace>Oceanbox</RootNamespace>
<Version>0.0.0-alpha.1</Version>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<EnableDefaultContentItems>false</EnableDefaultContentItems>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.8.0" />
<PackageReference Include="Fable.Remoting.Giraffe" Version="5.24.0" />
<PackageReference Include="Fargo.CmdLine" Version="1.7.5" />
<PackageReference Include="FsToolkit.ErrorHandling" Version="5.1.0" />
<PackageReference Include="Giraffe" Version="7.0.2" />
<PackageReference Include="Azure.Security.KeyVault.Secrets" />
<PackageReference Include="Fable.Remoting.Giraffe" />
<PackageReference Include="Fargo.CmdLine" />
<PackageReference Include="FsToolkit.ErrorHandling" />
<PackageReference Include="Giraffe" />
</ItemGroup>
<ItemGroup>
<Compile Include="../Shared/Remoting.fs" />
@@ -40,4 +40,4 @@
<ProjectReference Include="..\..\..\DataAgent\src\Entity\Entity.csproj" />
<ProjectReference Include="..\..\..\DataAgent\src\DataAgent\Oceanbox.DataAgent.fsproj" />
</ItemGroup>
</Project>
</Project>

1084
src/Codex/src/Server/packages.lock.json
View File

File diff suppressed because it is too large Load Diff

1
src/Interfaces/Api/Poseidon.Api.fsproj
View File

@@ -4,7 +4,6 @@
<OutputType>Library</OutputType>
<TargetFramework>net9.0</TargetFramework>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<IsPackable>true</IsPackable>
<PackageId>Poseidon.Api</PackageId>
<Authors/>

3
src/Interfaces/Api/packages.lock.json
View File

@@ -276,7 +276,6 @@
"resolved": "9.0.303",
"contentHash": "6JlV8aD8qQvcmfoe/PMOxCHXc0uX4lR23u0fAyQtnVQxYULLoTZgwgZHSnRcuUHOvS3wULFWcwdnP1iwslH60g=="
}
},
"net9.0/linux-x64": {}
}
}
}

8
src/ServerPack/src/Oceanbox.ServerPack.fsproj
View File

@@ -3,13 +3,11 @@
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net9.0</TargetFramework>
<PackageId>Oceanbox.ServerPack</PackageId>
<Version>1.33.1</Version>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<IsPackable>true</IsPackable>
<PackageId>Oceanbox.ServerPack</PackageId>
<Authors/>
<Company/>
<Version>1.33.1</Version>
</PropertyGroup>
<ItemGroup>
<Compile Include="Observer.fs"/>
@@ -44,4 +42,4 @@
<PackageReference Include="Thoth.Json.Net"/>
<PackageReference Include="FSharp.Core"/>
</ItemGroup>
</Project>
</Project>

1
src/Sorcerer/src/Server/Sorcerer.fsproj
View File

@@ -3,7 +3,6 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<Version>4.18.0</Version>
</PropertyGroup>

21
src/Sorcerer/src/Server/packages.lock.json
View File

@@ -1598,27 +1598,6 @@
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
}
},
"net9.0/linux-x64": {
"System.Security.Cryptography.Pkcs": {
"type": "Transitive",
"resolved": "9.0.2",
"contentHash": "aC9IlCbgompuyQUixa03yEq/fGDLwsSn1tiqFsk/hMDTSxcdf1Ha77SfDgdguLx+sAsuHWAkiXgveDsHdw5bdA=="
},
"System.Security.Cryptography.ProtectedData": {
"type": "Transitive",
"resolved": "4.5.0",
"contentHash": "wLBKzFnDCxP12VL9ANydSYhk59fC4cvOr9ypYQLPnAj48NQIhqnjdD2yhP8yEKyBJEjERWS9DisKL7rX5eU25Q=="
},
"System.Text.Encodings.Web": {
"type": "CentralTransitive",
"requested": "[9.0.2, )",
"resolved": "6.0.0",
"contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==",
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
}
}
}
}