This commit is contained in:
Luong Hoang 2016-07-17 23:16:52 -04:00
Родитель 4350dec357
Коммит ab92006cff
7 изменённых файлов: 25 добавлений и 261 удалений

Просмотреть файл

@ -271,7 +271,7 @@ hr.fancy-line, hr.fancy-line:before {
.btn.outline {
background: none;
max-width: 280px;
max-width: 400px;
}
.btn-primary.outline {
border: 2px solid #0099cc;
@ -312,7 +312,7 @@ div.glossary {
position: absolute;
top: 80px;
right: 60px;
max-width: 500px;
max-width: 460px;
}
}
@ -323,4 +323,8 @@ svg.azure-icon {
margin-left: 8px;
vertical-align: middle;
fill: #0099cc;
}
.helptext-on-interaction {
max-width: 400px;
}

Просмотреть файл

@ -459,10 +459,8 @@ namespace DecisionServicePrivateWeb.Controllers
{
var svm = new CollectiveSettingsView
{
ApplicationId = clientMetadata.ApplicationID,
AzureSubscriptionId = extraMetadata.SubscriptionId,
DecisionType = extraMetadata.DecisionType,
TrainFrequency = extraMetadata.TrainFrequency,
DecisionType = extraMetadata.DecisionType == DecisionType.SingleAction ? DecisionDisplayType.No : DecisionDisplayType.Yes,
TrainArguments = clientMetadata.TrainArguments,
AzureStorageConnectionString = ConfigurationManager.AppSettings[ApplicationMetadataStore.AKConnectionString],
AzureResourceGroupName = extraMetadata.AzureResourceGroupName,

Просмотреть файл

@ -317,6 +317,7 @@
<EmbeddedResource Include="HelpText.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<SubType>Designer</SubType>
<LastGenOutput>HelpText.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>

243
mc/HelpText.Designer.cs сгенерированный
Просмотреть файл

@ -1,243 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace DecisionServicePrivateWeb {
using System;
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
// This class was auto-generated by the StronglyTypedResourceBuilder
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class HelpText {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal HelpText() {
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
public static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DecisionServicePrivateWeb.HelpText", typeof(HelpText).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
public static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set {
resourceCulture = value;
}
}
/// <summary>
/// Looks up a localized string similar to Application Id ::: The name of this application, which becomes the Azure Resource Group name..
/// </summary>
public static string ApplicationId {
get {
return ResourceManager.GetString("ApplicationId", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Application Insights Instrumentation Key ::: Application Insights is a diagnostics logging service to aid with debugging the system. By default, all components of the Decision Service send detailed logs to Application Insights. To log additional information, use the displayed instrumentation key to initialize the telemetry client..
/// </summary>
public static string ApplicationInsightsInstrumentationKey {
get {
return ResourceManager.GetString("ApplicationInsightsInstrumentationKey", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Azure Stream Analytics Policy Evaluation ::: Decision Service has the ability to evaluate and compare many policies retrospectively. It achieves this partly by leveraging Azure Stream Analytics to collect real-time performance results of each policy. To see how this is done, view the policy evaluation query in ASA by clicking on the arrow to the right. .
/// </summary>
public static string ASAEvalName {
get {
return ResourceManager.GetString("ASAEvalName", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Azure Stream Analytics Join Server ::: Azure Stream Analytics is used to join interaction and observation data streams together. For more details view the join query in ASA by clicking on the arrow to the right..
/// </summary>
public static string ASAJoinName {
get {
return ResourceManager.GetString("ASAJoinName", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Azure Resource Group ::: Azure Resource Group name is the value chosen at deployment time. The resource group contains all Azure resources (such as cloud services, storage accounts, etc...) deployed as part of the Decision Service..
/// </summary>
public static string AzureResourceGroupName {
get {
return ResourceManager.GetString("AzureResourceGroupName", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Azure Storage Connection String ::: Azure Storage contains all data produced and consumed by Decision Service. For example, the joined data and machine-learned models are created and stored here. The Azure Storage Connection String is needed to programmatically connect to the storage account and retrieve data. Click on the arrow to view these data from the Azure portal..
/// </summary>
public static string AzureStorageConnectionString {
get {
return ResourceManager.GetString("AzureStorageConnectionString", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Azure Subscription Id ::: The Id of the Azure Subscription containing all used for this deployment..
/// </summary>
public static string AzureSubscriptionId {
get {
return ResourceManager.GetString("AzureSubscriptionId", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Context Type ::: Whether the context uses action-dependent features or only regular features..
/// </summary>
public static string DecisionType {
get {
return ResourceManager.GetString("DecisionType", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Event Hub Interaction Connection String ::: Connection string of the Event Hub associated with ASA Join Server which accepts interaction data from the Client Library or Web Service...
/// </summary>
public static string EventHubInteractionConnectionString {
get {
return ResourceManager.GetString("EventHubInteractionConnectionString", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Event Hub Observation Connection String ::: Connection string of the Event Hub associated with ASA Join Server which accepts observation data (i.e. rewards) from the Client Library or Web Service..
/// </summary>
public static string EventHubObservationConnectionString {
get {
return ResourceManager.GetString("EventHubObservationConnectionString", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Join Timeout (in seconds) ::: The timeout duration of the interaction-observation join that occurs in ASA..
/// </summary>
public static string ExperimentalUnitDuration {
get {
return ResourceManager.GetString("ExperimentalUnitDuration", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Initial Epsilon Exploration ::: The initial epsilon value to use in epsilon-greedy exploration when the client has not obtained a machine-learned model. Epsilon = 0 indicates no randomization while Epsilon = 1 implies uniform random.
/// </summary>
public static string InitialExplorationEpsilon {
get {
return ResourceManager.GetString("InitialExplorationEpsilon", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Enable Exploration ::: Whether to enable exploration in Client Library or Web Service. This is useful as a safety mechanism in case exploration results in undesired application behavior..
/// </summary>
public static string IsExplorationEnabled {
get {
return ResourceManager.GetString("IsExplorationEnabled", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Online Trainer ::: The address of the cloud service that performs online training..
/// </summary>
public static string OnlineTrainerAddress {
get {
return ResourceManager.GetString("OnlineTrainerAddress", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Model to Deploy ::: The list of trained models detected in Azure Storage. The selected model will be deployed to all clients..
/// </summary>
public static string SelectedModelId {
get {
return ResourceManager.GetString("SelectedModelId", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Settings Blob Address ::: The address of the settings for the application..
/// </summary>
public static string SettingsBlobUri {
get {
return ResourceManager.GetString("SettingsBlobUri", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to VW Arguments ::: VW arguments that control training and exploration..
/// </summary>
public static string TrainArguments {
get {
return ResourceManager.GetString("TrainArguments", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Training Frequency ::: High frequency corresponds to online training where data points are continuously used for learning. Low frequency corresponds to batch training which occurs at longer time intervals (e.g. every 5 minutes or once a day)..
/// </summary>
public static string TrainFrequency {
get {
return ResourceManager.GetString("TrainFrequency", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to HTTP Endpoint ::: The address of the Web Service which can accept HTTP requests. This serves as an alternative data entry point to the Decision Service..
/// </summary>
public static string WebApiAddress {
get {
return ResourceManager.GetString("WebApiAddress", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Management Center Address ::: The address of the Management Center..
/// </summary>
public static string WebManageName {
get {
return ResourceManager.GetString("WebManageName", resourceCulture);
}
}
}
}

Просмотреть файл

@ -121,7 +121,7 @@
<value>Application Id ::: The name of this application, which becomes the Azure Resource Group name.</value>
</data>
<data name="ApplicationInsightsInstrumentationKey" xml:space="preserve">
<value>Application Insights Instrumentation Key ::: Application Insights is a diagnostics logging service to aid with debugging the system. By default, all components of the Decision Service send detailed logs to Application Insights. To log additional information, use the displayed instrumentation key to initialize the telemetry client.</value>
<value>Application Insights Instrumentation Key ::: Application Insights is a diagnostics logging service to aid with debugging the system. By default, all components of the Decision Service send detailed logs to Application Insights. To log additional information, use the displayed instrumentation key to initialize the telemetry client: https://azure.microsoft.com/en-us/documentation/articles/app-insights-overview/</value>
</data>
<data name="ASAEvalName" xml:space="preserve">
<value>Azure Stream Analytics Policy Evaluation ::: Decision Service has the ability to evaluate and compare many policies retrospectively. It achieves this partly by leveraging Azure Stream Analytics to collect real-time performance results of each policy. To see how this is done, view the policy evaluation query in ASA by clicking on the arrow to the right. </value>
@ -136,10 +136,10 @@
<value>Azure Storage Connection String ::: Azure Storage contains all data produced and consumed by Decision Service. For example, the joined data and machine-learned models are created and stored here. The Azure Storage Connection String is needed to programmatically connect to the storage account and retrieve data. Click on the arrow to view these data from the Azure portal.</value>
</data>
<data name="AzureSubscriptionId" xml:space="preserve">
<value>Azure Subscription Id ::: The Id of the Azure Subscription containing all used for this deployment.</value>
<value>Azure Subscription Id ::: ID of the Azure subscription used for this deployment.</value>
</data>
<data name="DecisionType" xml:space="preserve">
<value>Context Type ::: Whether the context uses action-dependent features or only regular features.</value>
<value>Actions With Features ::: Do actions come with features? Such features are called Action-Dependent Features and are included in the context. </value>
</data>
<data name="EventHubInteractionConnectionString" xml:space="preserve">
<value>Event Hub Interaction Connection String ::: Connection string of the Event Hub associated with ASA Join Server which accepts interaction data from the Client Library or Web Service..</value>
@ -148,7 +148,7 @@
<value>Event Hub Observation Connection String ::: Connection string of the Event Hub associated with ASA Join Server which accepts observation data (i.e. rewards) from the Client Library or Web Service.</value>
</data>
<data name="ExperimentalUnitDuration" xml:space="preserve">
<value>Join Timeout (in seconds) ::: The timeout duration of the interaction-observation join that occurs in ASA.</value>
<value>Experimental Unit Duration (in seconds) ::: How long after a decision is all the pertinent info sent to the trainer? (Min 5; Max 518400).</value>
</data>
<data name="IsExplorationEnabled" xml:space="preserve">
<value>Enable Exploration ::: Whether to enable exploration in Client Library or Web Service. This is useful as a safety mechanism in case exploration results in undesired application behavior.</value>
@ -160,10 +160,10 @@
<value>Model to Deploy ::: The list of trained models detected in Azure Storage. The selected model will be deployed to all clients.</value>
</data>
<data name="SettingsBlobUri" xml:space="preserve">
<value>Settings Blob Address ::: The address of the settings for the application.</value>
<value>Address For Settings ::: The address of the settings for the application.</value>
</data>
<data name="TrainArguments" xml:space="preserve">
<value>VW Arguments ::: VW arguments that control training and exploration.</value>
<value>VW Arguments ::: VW arguments that control training and exploration. Only change this if you're sure what the flags mean in VW. For more information, refer to the wiki at https://github.com/JohnLangford/vowpal_wabbit/wiki.</value>
</data>
<data name="TrainFrequency" xml:space="preserve">
<value>Training Frequency ::: High frequency corresponds to online training where data points are continuously used for learning. Low frequency corresponds to batch training which occurs at longer time intervals (e.g. every 5 minutes or once a day).</value>
@ -175,6 +175,6 @@
<value>Management Center Address ::: The address of the Management Center.</value>
</data>
<data name="InitialExplorationEpsilon" xml:space="preserve">
<value>Initial Epsilon Exploration ::: The initial epsilon value to use in epsilon-greedy exploration when the client has not obtained a machine-learned model. Epsilon = 0 indicates no randomization while Epsilon = 1 implies uniform random</value>
<value>Initial Exploration Probability ::: Probability of exploration while waiting for the first model to be deployed. Epsilon = 0 indicates no randomization while Epsilon = 1 implies uniform random</value>
</data>
</root>

Просмотреть файл

@ -6,7 +6,6 @@ namespace DecisionServicePrivateWeb.Models
{
public class CollectiveSettingsView
{
public string ApplicationId { get; set; }
public string AzureSubscriptionId { get; set; }
public string AzureResourceGroupName { get; set; }
public string ApplicationInsightsInstrumentationKey { get; set; }
@ -15,8 +14,7 @@ namespace DecisionServicePrivateWeb.Models
public string WebApiAddress { get; set; }
public string ASAEvalName { get; set; }
public string ASAJoinName { get; set; }
public DecisionType DecisionType { get; set; }
public TrainFrequency TrainFrequency { get; set; }
public DecisionDisplayType DecisionType { get; set; }
public string TrainArguments { get; set; }
public string AzureStorageConnectionString { get; set; }
public string EventHubInteractionConnectionString { get; set; }
@ -28,6 +26,12 @@ namespace DecisionServicePrivateWeb.Models
public Dictionary<string, List<string>> NameHelpLink { get; set; }
}
public enum DecisionDisplayType
{
No = 1,
Yes
}
public class BlobModelViewModel
{
public string Name { get; set; }

Просмотреть файл

@ -17,8 +17,8 @@
{
var readOnlyStyle = item.IsEditable == true ? string.Empty : "readonly=readonly";
<div class="form-group">
<label for="@item.Name" class="col-sm-2 control-label ds-label">@item.DisplayName</label>
<div class="col-sm-10">
<label for="@item.Name" class="col-sm-3 control-label ds-label">@item.DisplayName</label>
<div class="col-sm-9">
@if (item.IsSplotlightUrl == true)
{
<a id="@item.Name" style="overflow: hidden" class="btn btn-primary outline form-control helptext-on-interaction" href="@item.Url" target="_blank">@item.Value</a>
@ -32,7 +32,7 @@
case "String":
case "Int32":
case "Single":
case "DecisionType":
case "DecisionDisplayType":
case "TrainFrequency":
<input type="text" @readOnlyStyle style="display:inline;" class="form-control helptext-on-interaction" id="@item.Name" name="@item.Name" value="@item.Value" />
break;