Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed namespace scenario for lugen cs #501

Merged
merged 4 commits into from
Feb 3, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions packages/lu/src/commands/luis/generate/cs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,13 @@ export default class LuisGenerateCs extends Command {
}

flags.className = flags.className || app.name
flags.className = upperFirst(camelCase(flags.className))

const dot_index = flags.className ? flags.className.indexOf('.') : -1
const dot_index = flags.className ? flags.className.lastIndexOf('.') : -1
if (dot_index !== -1) {
space = flags.className.substr(dot_index + 1)
flags.className = flags.className.substr(0, dot_index)
space = flags.className.substr(0, dot_index)
flags.className = flags.className.substr(dot_index + 1)
} else {
flags.className = upperFirst(camelCase(flags.className))
}

this.reorderEntities(app, 'entities')
Expand Down
13 changes: 13 additions & 0 deletions packages/lu/test/commands/luis/generate/cs.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,17 @@ describe('luis:generate:cs', () => {
expect(ctx.stdout).to.include('Generating file at stdout')
expect(ctx.stdout).to.include('// <auto-generated>')
})

test
.stdout()
.command(['luis:generate:cs',
'--in',
`${path.join(__dirname, '../../../fixtures/generate/SimpleEntities.json')}`,
'--className',
'Test.Namespace.NameOfTheClass',
'--out',
`${path.join(__dirname, '../../../fixtures/generate/results/')}`])
.it('Generates class with namespace correctly', async () => {
await compareSourceFiles('../../../fixtures/generate/NameSpaceClass.cs', '../../../fixtures/generate/results/NameOfTheClass.cs')
})
})
89 changes: 89 additions & 0 deletions packages/lu/test/fixtures/generate/NamespaceClass.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
// <auto-generated>
// Code generated by luis:generate:cs
// Tool github: https://github.com/microsoft/botframwork-cli
// Changes may cause incorrect behavior and will be lost if the code is
// regenerated.
// </auto-generated>
using Newtonsoft.Json;
using System.Collections.Generic;
using Microsoft.Bot.Builder;
using Microsoft.Bot.Builder.AI.Luis;
namespace Test.Namespace
{
public partial class NameOfTheClass: IRecognizerConvert
{
[JsonProperty("text")]
public string Text;

[JsonProperty("alteredText")]
public string AlteredText;

public enum Intent {
};
[JsonProperty("intents")]
public Dictionary<Intent, IntentScore> Intents;

public class _Entities
{
// Simple entities
public string[] City;
public string[] To;
public string[] From;
public string[] Name;
public string[] likee;
public string[] liker;
public string[] State;
public string[] Weather_Location;
public string[] destination;
public string[] source;


// Instance
public class _Instance
{
public InstanceData[] City;
public InstanceData[] From;
public InstanceData[] Name;
public InstanceData[] State;
public InstanceData[] To;
public InstanceData[] Weather_Location;
public InstanceData[] destination;
public InstanceData[] likee;
public InstanceData[] liker;
public InstanceData[] source;
}
[JsonProperty("$instance")]
public _Instance _instance;
}
[JsonProperty("entities")]
public _Entities Entities;

[JsonExtensionData(ReadData = true, WriteData = true)]
public IDictionary<string, object> Properties {get; set; }

public void Convert(dynamic result)
{
var app = JsonConvert.DeserializeObject<NameOfTheClass>(JsonConvert.SerializeObject(result, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }));
Text = app.Text;
AlteredText = app.AlteredText;
Intents = app.Intents;
Entities = app.Entities;
Properties = app.Properties;
}

public (Intent intent, double score) TopIntent()
{
Intent maxIntent = Intent.None;
var max = 0.0;
foreach (var entry in Intents)
{
if (entry.Value.Score > max)
{
maxIntent = entry.Key;
max = entry.Value.Score.Value;
}
}
return (maxIntent, max);
}
}
}