Merged with main.

.github/workflows/create-docs-issues.yml

@@ -26,7 +26,7 @@ jobs:
  await script({github, context});
 
  - name: Slack Failure Message
- uses: slackapi/slack-github-action@v1.26.0
+ uses: slackapi/slack-github-action@v1.27.0
  id: slack-failure-message
  if: failure() && github.ref == 'refs/heads/main' && github.repository_owner == 'deephaven'
  env:

.github/workflows/nightly-check-ci.yml

@@ -100,7 +100,7 @@ jobs:
  report_paths: '**/build/test-results/*/TEST-*.xml'
 
  - name: Slack Nightly Failure
- uses: slackapi/slack-github-action@v1.26.0
+ uses: slackapi/slack-github-action@v1.27.0
  id: slack-nightly-failure
  if: ${{ failure() && github.repository_owner == 'deephaven' }}
  with:

.github/workflows/nightly-image-check.yml

@@ -35,7 +35,7 @@ jobs:
  run: ./gradlew --continue pullImage compareImage
 
  - name: Notify Slack
- uses: slackapi/slack-github-action@v1.26.0
+ uses: slackapi/slack-github-action@v1.27.0
  id: notify-slack
  if: ${{ failure() }}
  env:

.github/workflows/nightly-publish-ci.yml

@@ -55,7 +55,7 @@ jobs:
  ORG_GRADLE_PROJECT_signingRequired: true
 
  - name: Slack Nightly Failure
- uses: slackapi/slack-github-action@v1.26.0
+ uses: slackapi/slack-github-action@v1.27.0
  id: slack-nightly-failure
  if: failure()
  with:

cpp-client/deephaven/vcpkg.json

@@ -11,7 +11,7 @@
  ],
 
  "overrides": [
- { "name": "arrow", "version": "16.0.0" },
+ { "name": "arrow", "version": "16.1.0#1" },
  { "name": "protobuf", "version": "4.25.1" }
  ]
 }

csharp/ExcelAddIn/DeephavenExcelFunctions.cs

@@ -0,0 +1,67 @@
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using Deephaven.ExcelAddIn.ExcelDna;
+using Deephaven.ExcelAddIn.Factories;
+using Deephaven.ExcelAddIn.Models;
+using Deephaven.ExcelAddIn.Operations;
+using Deephaven.ExcelAddIn.Providers;
+using Deephaven.ExcelAddIn.Viewmodels;
+using Deephaven.ExcelAddIn.Views;
+using ExcelDna.Integration;
+
+namespace Deephaven.ExcelAddIn;
+
+public static class DeephavenExcelFunctions {
+ private static readonly StateManager StateManager = new();
+
+ [ExcelCommand(MenuName = "Deephaven", MenuText = "Connections")]
+ public static void ShowConnectionsDialog() {
+ ConnectionManagerDialogFactory.CreateAndShow(StateManager);
+ }
+
+ [ExcelFunction(Description = "Snapshots a table", IsThreadSafe = true)]
+ public static object DEEPHAVEN_SNAPSHOT(string tableDescriptor, object filter, object wantHeaders) {
+ if (!TryInterpretCommonArgs(tableDescriptor, filter, wantHeaders, out var td, out var filt, out var wh, out var errorText)) {
+ return errorText;
+ }
+
+ // These two are used by ExcelDNA to share results for identical invocations. The functionName is arbitary but unique.
+ const string functionName = "Deephaven.ExcelAddIn.DeephavenExcelFunctions.DEEPHAVEN_SNAPSHOT";
+ var parms = new[] { tableDescriptor, filter, wantHeaders };
+ ExcelObservableSource eos = () => new SnapshotOperation(td!, filt, wh, StateManager);
+ return ExcelAsyncUtil.Observe(functionName, parms, eos);
+ }
+
+ [ExcelFunction(Description = "Subscribes to a table", IsThreadSafe = true)]
+ public static object DEEPHAVEN_SUBSCRIBE(string tableDescriptor, object filter, object wantHeaders) {
+ if (!TryInterpretCommonArgs(tableDescriptor, filter, wantHeaders, out var td, out var filt, out var wh, out string errorText)) {
+ return errorText;
+ }
+ // These two are used by ExcelDNA to share results for identical invocations. The functionName is arbitary but unique.
+ const string functionName = "Deephaven.ExcelAddIn.DeephavenExcelFunctions.DEEPHAVEN_SUBSCRIBE";
+ var parms = new[] { tableDescriptor, filter, wantHeaders };
+ ExcelObservableSource eos = () => new SubscribeOperation(td, filt, wh, StateManager);
+ return ExcelAsyncUtil.Observe(functionName, parms, eos);
+ }
+
+ private static bool TryInterpretCommonArgs(string tableDescriptor, object filter, object wantHeaders,
+ [NotNullWhen(true)]out TableTriple? tableDescriptorResult, out string filterResult, out bool wantHeadersResult, out string errorText) {
+ filterResult = "";
+ wantHeadersResult = false;
+ if (!TableTriple.TryParse(tableDescriptor, out tableDescriptorResult, out errorText)) {
+ return false;
+ }
+
+ if (!ExcelDnaHelpers.TryInterpretAs(filter, "", out filterResult)) {
+ errorText = "Can't interpret FILTER argument";
+ return false;
+ }
+
+
+ if (!ExcelDnaHelpers.TryInterpretAs(wantHeaders, false, out wantHeadersResult)) {
+ errorText = "Can't interpret WANT_HEADERS argument";
+ return false;
+ }
+ return true;
+ }
+}

csharp/ExcelAddIn/ExcelAddIn.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFramework>net8.0-windows</TargetFramework>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <Nullable>enable</Nullable>
+ <UseWindowsForms>true</UseWindowsForms>
+ <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+ <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+ <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+ </PropertyGroup>
+ <ItemGroup>
+ <PackageReference Include="ExcelDna.Addin" Version="*-*" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\client\DeephavenClient\DeephavenClient.csproj" />
+ </ItemGroup>
+</Project>

csharp/ExcelAddIn/ExcelAddIn.csproj.user

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup />
+ <ItemGroup>
+ <Compile Update="views\ConnectionManagerDialog.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="views\CredentialsDialog.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ </ItemGroup>
+</Project>

csharp/ExcelAddIn/ExcelAddIn.sln

@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.7.34221.43
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExcelAddIn", "ExcelAddIn.csproj", "{08852A0D-DB96-404E-B3CE-BF30F2AD3F74}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeephavenClient", "..\client\DeephavenClient\DeephavenClient.csproj", "{6848407D-1CEF-4433-92F4-6047AE3D2C52}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {08852A0D-DB96-404E-B3CE-BF30F2AD3F74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {08852A0D-DB96-404E-B3CE-BF30F2AD3F74}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {08852A0D-DB96-404E-B3CE-BF30F2AD3F74}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {08852A0D-DB96-404E-B3CE-BF30F2AD3F74}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6848407D-1CEF-4433-92F4-6047AE3D2C52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6848407D-1CEF-4433-92F4-6047AE3D2C52}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6848407D-1CEF-4433-92F4-6047AE3D2C52}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6848407D-1CEF-4433-92F4-6047AE3D2C52}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {A22A4DB3-DD84-46EB-96A6-7935E9E59356}
+ EndGlobalSection
+EndGlobal

csharp/ExcelAddIn/Properties/launchSettings.json

@@ -0,0 +1,9 @@
+{
+ "profiles": {
+ "Excel": {
+ "commandName": "Executable",
+ "executablePath": "C:\\Program Files\\Microsoft Office\\root\\Office16\\EXCEL.EXE",
+ "commandLineArgs": "/x \"ExcelAddIn-AddIn64.xll\""
+ }
+ }
+}