Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: hcmlab/nova
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.2.9.6
Choose a base ref
...
head repository: hcmlab/nova
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Nov 19, 2024

  1. bump version

    tobiasbaur committed Nov 19, 2024
    Copy the full SHA
    6bce568 View commit details

Commits on Nov 21, 2024

  1. add num_ctx parameter

    tobiasbaur committed Nov 21, 2024
    Copy the full SHA
    9b829ee View commit details

Commits on Nov 22, 2024

  1. bump version

    tobiasbaur committed Nov 22, 2024
    Copy the full SHA
    7feec4b View commit details

Commits on Nov 23, 2024

  1. fix default values, ui

    tobiasbaur committed Nov 23, 2024
    Copy the full SHA
    238fb4e View commit details
  2. bump

    tobiasbaur committed Nov 23, 2024
    Copy the full SHA
    aa51eb1 View commit details

Commits on Nov 25, 2024

  1. suppress binding warning

    tobiasbaur committed Nov 25, 2024
    Copy the full SHA
    b53ef3d View commit details

Commits on Nov 28, 2024

  1. Copy the full SHA
    302144c View commit details
  2. Copy the full SHA
    0d957be View commit details
  3. Copy the full SHA
    9fa081d View commit details
  4. Update nova.exe

    tobiasbaur committed Nov 28, 2024
    Copy the full SHA
    0196839 View commit details
  5. enable post process option

    tobiasbaur committed Nov 28, 2024
    Copy the full SHA
    3ab8ac3 View commit details
  6. Copy the full SHA
    c040770 View commit details

Commits on Nov 29, 2024

  1. Copy the full SHA
    9f27870 View commit details

Commits on Feb 4, 2025

  1. fixed 590

    Funkie42 committed Feb 4, 2025
    Copy the full SHA
    0d31d10 View commit details
  2. spaces aligned

    Funkie42 committed Feb 4, 2025
    Copy the full SHA
    c6382c2 View commit details
  3. Merge pull request #591 from hcmlab/bugfix_590

    Bugfix 590
    Funkie42 authored Feb 4, 2025
    Copy the full SHA
    14550e3 View commit details
  4. build for the fix

    Funkie42 committed Feb 4, 2025
    Copy the full SHA
    fe8a937 View commit details
  5. Merge pull request #592 from hcmlab/bugfix_590

    build for the fix
    Funkie42 authored Feb 4, 2025
    Copy the full SHA
    a1ceae2 View commit details

Commits on Feb 5, 2025

  1. adjust main handler

    Funkie42 committed Feb 5, 2025
    Copy the full SHA
    551a9c8 View commit details
  2. Merge pull request #593 from hcmlab/bugfix_590

    adjust main handler
    Funkie42 authored Feb 5, 2025
    Copy the full SHA
    26d05c5 View commit details
  3. build again

    Funkie42 committed Feb 5, 2025
    Copy the full SHA
    3bad001 View commit details
  4. Merge pull request #594 from hcmlab/bugfix_590

    build again
    Funkie42 authored Feb 5, 2025
    Copy the full SHA
    fe8a77d View commit details
2 changes: 2 additions & 0 deletions Controls/LLAMA.xaml.cs
Original file line number Diff line number Diff line change
@@ -177,6 +177,7 @@ public async void callLLAMA2(object pr)
int maxtokens = int.Parse(Properties.Settings.Default.NovaAssistantMaxtokens);
int topk = int.Parse(Properties.Settings.Default.NovaAssistantTopK);
float topP = float.Parse(Properties.Settings.Default.NovaAssistantTopP);
int num_ctx = int.Parse(Properties.Settings.Default.NovaAssistantNum_ctx);
bool contextaware = true;


@@ -259,6 +260,7 @@ public async void callLLAMA2(object pr)
provider = provider,
message = message,
temperature = temperature,
num_ctx = num_ctx,
max_new_tokens = maxtokens,
top_p = topP,
top_k = topk,
3 changes: 2 additions & 1 deletion Controls/MainHandler.cs
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ public partial class MainHandler
{

//Config
public static string BuildVersion = "1.2.9.6";
public static string BuildVersion = "1.3.0.1";
public static MEDIABACKEND MediaBackend = (Properties.Settings.Default.MediaBackend == "Hardware") ? MEDIABACKEND.MEDIAKIT : MEDIABACKEND.MEDIA;
public static bool ENABLE_PYTHON = Properties.Settings.Default.EnablePython;
public static bool ENABLE_LIGHTNING = Properties.Settings.Default.EnableLightning;
@@ -826,6 +826,7 @@ private void showSettings()
Properties.Settings.Default.EnableLightning = s.EnableLightning();
Properties.Settings.Default.MediaBackend = s.Mediabackend();
Properties.Settings.Default.SRTwordlevel = s.EnableSRTWordlevel();
Properties.Settings.Default.NovaAssistantNum_ctx = s.Num_ctx();

Properties.Settings.Default.Save();
if (Properties.Settings.Default.NovaAssistantAddress == "")
2 changes: 1 addition & 1 deletion Controls/MainHandlerDatabase.cs
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ private async void databaseConnect(bool reconnect = false)
}
else
{
MessageTools.Warning("Unable to connect to database, please check your settings\nIf you created a new account, please restart the Software");
MessageTools.Warning("Unable to connect to database, please check your settings.\nIf you created a new account, please restart the Software.");
Properties.Settings.Default.DatabaseAutoLogin = false;
Properties.Settings.Default.Save();
}
6 changes: 5 additions & 1 deletion Controls/MainHandlerMenu.cs
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Xml.Linq;

namespace ssi
{
@@ -48,8 +49,11 @@ private void updateMenu()
control.databaseCMLMergeAnnotationsMenu.IsEnabled = isConnected && (authentication > DatabaseAuthentication.READ);
//control.databaseCMLTrainAndPredictMenu.IsEnabled = isConnected && (authentication > DatabaseAuthentication.READ);



control.databaseAdminMenu.Visibility = isConnected && (authentication > DatabaseAuthentication.READWRITE) ? Visibility.Visible : Visibility.Collapsed;
control.databaseManageUsersMenu.Visibility = isConnected && (authentication > DatabaseAuthentication.DBADMIN) ? Visibility.Visible : Visibility.Collapsed;
control.databaseManageUsersMenu.Visibility = isConnected && (authentication > DatabaseAuthentication.READWRITE) ? Visibility.Visible : Visibility.Collapsed;



//control.fusionmenu.Visibility = (File.Exists(AppDomain.CurrentDomain.BaseDirectory + "\\bayesfusion.exe") == true) ? Visibility.Visible : Visibility.Collapsed;
7 changes: 5 additions & 2 deletions Controls/Other/Settings.xaml
Original file line number Diff line number Diff line change
@@ -257,6 +257,7 @@
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
</Grid.RowDefinitions>
@@ -277,8 +278,10 @@
<TextBox Grid.Column="1" Width="30" HorizontalAlignment="Left" Grid.Row="6" Name="TopP" Margin="5,0,5,2" Height="21" VerticalAlignment="Bottom" />
<Label Grid.Column="0" Grid.Row="7">TopK:</Label>
<TextBox Grid.Column="1" Width="30" HorizontalAlignment="Left" Grid.Row="7" Name="TopK" Margin="5,0,5,2" Height="21" VerticalAlignment="Bottom" />
<Label Grid.Column="0" Grid.Row="8">Enforce Determinism:</Label>
<CheckBox Grid.Column="1" Width="30" HorizontalAlignment="Left" Grid.Row="8" Name="Determinism" Margin="5,0,5,2" Height="21" VerticalAlignment="Bottom" />
<Label Grid.Column="0" Grid.Row="8">NumCtx:</Label>
<TextBox Grid.Column="1" Width="30" HorizontalAlignment="Left" Grid.Row="8" Name="num_ctx" Margin="5,0,5,2" Height="21" VerticalAlignment="Bottom" />
<Label Grid.Column="0" Grid.Row="9">Enforce Determinism:</Label>
<CheckBox Grid.Column="1" Width="30" HorizontalAlignment="Left" Grid.Row="9" Name="Determinism" Margin="5,0,5,2" Height="21" VerticalAlignment="Bottom" />


</Grid>
6 changes: 6 additions & 0 deletions Controls/Other/Settings.xaml.cs
Original file line number Diff line number Diff line change
@@ -89,6 +89,7 @@ public Settings()
TopP.Text = Properties.Settings.Default.NovaAssistantTopP;
MaxTokens.Text = Properties.Settings.Default.NovaAssistantMaxtokens;
Determinism.IsChecked = Properties.Settings.Default.NovaAssistantEnforceDeterminism;
num_ctx.Text = Properties.Settings.Default.NovaAssistantNum_ctx;

if (DBHost.Text != Defaults.checkdb)
{
@@ -188,6 +189,11 @@ public bool Enfoce_Determinism()
return Determinism.IsChecked == true;
}

public string Num_ctx()
{
return num_ctx.Text;
}




3 changes: 2 additions & 1 deletion Database/DatabaseAdminAnnotatorWindow.xaml.cs
Original file line number Diff line number Diff line change
@@ -39,7 +39,8 @@ public DatabaseAdminAnnotatorWindow(ref DatabaseAnnotator annotator, List<string

foreach (var item in RoleBox.Items)
{
if (item.ToString().Contains(annotator.Role))
var comboBoxItem = item as ComboBoxItem;
if (comboBoxItem.Content.Equals(annotator.Role))
{
RoleBox.SelectedItem = item;
}
2 changes: 1 addition & 1 deletion Database/DatabaseHandler.cs
Original file line number Diff line number Diff line change
@@ -4831,7 +4831,7 @@ public override string ToString()
return Name;
}

//public bool hasMatchingAnnotations { get; set; }
public bool hasMatchingAnnotations { get; set; }
}

public class DatabaseUser
2 changes: 1 addition & 1 deletion Database/DatabaseNovaServerWindow.xaml
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@
</DataTrigger>
<!-- When a file is missing color it red. -->
<DataTrigger Binding="{Binding hasMatchingAnnotations, Converter={StaticResource StreamColorConverter}}" Value="-1">
<Setter Property="Foreground" Value="{StaticResource IsMissingBrush}" />
<Setter Property="Foreground" Value="{StaticResource ExistsBrush}" />
</DataTrigger>
</Style.Triggers>
</Style>
10 changes: 9 additions & 1 deletion Database/DatabaseNovaServerWindow.xaml.cs
Original file line number Diff line number Diff line change
@@ -993,7 +993,7 @@ private void UpdateFrontEnd()

}

if (hasdiscreteoutput)
if (hasdiscreteoutput && processor.enable_post_process)
{
PredictOptionsPanel.Visibility = System.Windows.Visibility.Visible;
}
@@ -1279,6 +1279,7 @@ public class Processor
public bool isIterable { get; set; }

public bool isTrained { get; set; }
public bool enable_post_process { get; set; }
public List<ServerInputOutput> Inputs { get; set; }
public List<ServerInputOutput> Outputs { get; set; }

@@ -1367,6 +1368,7 @@ private bool parseProcessorFile(ref Processor processor, JToken ProcessorEntry)
processor.Category = "0";
processor.Description = "";
processor.Backend = "NOVA-SERVER";
processor.enable_post_process = true;
processor.isTrained = ((bool)chainobject["info_trained"]);
if (!processor.isTrained)
{ return false; }
@@ -1409,6 +1411,12 @@ private bool parseProcessorFile(ref Processor processor, JToken ProcessorEntry)
processor.isIterable = ((bool)chainobject["meta_is_iterable"]);
}

var showOpts = chainobject["meta_enable_post_process"];
if (showOpts != null)
{
processor.enable_post_process = ((bool)chainobject["meta_enable_post_process"]);
}

//var elements = chainobject["links"];

//JArray arr = JArray.Parse(elements.ToString());
12 changes: 12 additions & 0 deletions Properties/Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Properties/Settings.settings
Original file line number Diff line number Diff line change
@@ -218,5 +218,8 @@
<Setting Name="NostrDVM" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="NovaAssistantNum_ctx" Type="System.String" Scope="User">
<Value Profile="(Default)">2028</Value>
</Setting>
</Settings>
</SettingsFile>
6 changes: 6 additions & 0 deletions app.config
Original file line number Diff line number Diff line change
@@ -295,6 +295,12 @@
<setting name="NovaAssistantEnforceDeterminism" serializeAs="String">
<value>False</value>
</setting>
<setting name="NostrDVM" serializeAs="String">
<value>False</value>
</setting>
<setting name="NovaAssistantNum_ctx" serializeAs="String">
<value>2028</value>
</setting>
</ssi.Properties.Settings>
</userSettings>
</configuration>
Binary file modified bin/nova.exe
Binary file not shown.
5 changes: 3 additions & 2 deletions nova.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29613.14
# Visual Studio Version 17
VisualStudioVersion = 17.5.33530.505
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nova", "nova.csproj", "{81C49A93-25B8-47ED-BD84-AD5F9A0C0D79}"
EndProject
@@ -35,6 +35,7 @@ Global
{81C49A93-25B8-47ED-BD84-AD5F9A0C0D79}.Debug|x64.ActiveCfg = Debug|x64
{81C49A93-25B8-47ED-BD84-AD5F9A0C0D79}.Debug|x64.Build.0 = Debug|x64
{81C49A93-25B8-47ED-BD84-AD5F9A0C0D79}.Release|Any CPU.ActiveCfg = Release|x64
{81C49A93-25B8-47ED-BD84-AD5F9A0C0D79}.Release|Any CPU.Build.0 = Release|x64
{81C49A93-25B8-47ED-BD84-AD5F9A0C0D79}.Release|x64.ActiveCfg = Release|x64
{81C49A93-25B8-47ED-BD84-AD5F9A0C0D79}.Release|x64.Build.0 = Release|x64
{B45A0B04-EF3C-48AB-8E21-3AA80124BC3A}.Debug|Any CPU.ActiveCfg = Debug|x64