Skip to content

Commit 1b56dc7

Browse files
committed
Temporarily make ModerationApplicableInputKinds internal
1 parent 3d1121a commit 1b56dc7

File tree

5 files changed

+15
-20
lines changed

5 files changed

+15
-20
lines changed

api/OpenAI.netstandard2.0.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2170,15 +2170,7 @@ public static class OpenAIModelsModelFactory {
21702170
}
21712171
}
21722172
namespace OpenAI.Moderations {
2173-
[Flags]
2174-
public enum ModerationApplicableInputKinds {
2175-
None = 0,
2176-
Other = 1,
2177-
Text = 2,
2178-
Image = 4
2179-
}
21802173
public class ModerationCategory {
2181-
public ModerationApplicableInputKinds ApplicableInputKinds { get; }
21822174
public bool Flagged { get; }
21832175
public float Score { get; }
21842176
}
@@ -2229,7 +2221,7 @@ public class ModerationResultCollection : ObjectModel.ReadOnlyCollection<Moderat
22292221
BinaryData IPersistableModel<ModerationResultCollection>.Write(ModelReaderWriterOptions options);
22302222
}
22312223
public static class OpenAIModerationsModelFactory {
2232-
public static ModerationCategory ModerationCategory(bool flagged = false, float score = 0, ModerationApplicableInputKinds applicableInputKinds = ModerationApplicableInputKinds.None);
2224+
public static ModerationCategory ModerationCategory(bool flagged = false, float score = 0);
22332225
public static ModerationResult ModerationResult(bool flagged = false, ModerationCategory hate = null, ModerationCategory hateThreatening = null, ModerationCategory harassment = null, ModerationCategory harassmentThreatening = null, ModerationCategory selfHarm = null, ModerationCategory selfHarmIntent = null, ModerationCategory selfHarmInstructions = null, ModerationCategory sexual = null, ModerationCategory sexualMinors = null, ModerationCategory violence = null, ModerationCategory violenceGraphic = null, ModerationCategory illicit = null, ModerationCategory illicitViolent = null);
22342226
public static ModerationResultCollection ModerationResultCollection(string id = null, string model = null, IEnumerable<ModerationResult> items = null);
22352227
}

src/Custom/Moderations/ModerationApplicableInputKinds.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace OpenAI.Moderations;
55
/// <summary> The kinds of inputs that <see cref="ModerationCategory.Score"/> is applicable to. </summary>
66
[Flags]
77
[CodeGenModel("ModerationAppliedInputType")]
8-
public enum ModerationApplicableInputKinds : int
8+
internal enum ModerationApplicableInputKinds : int
99
{
1010
None = 0,
1111

src/Custom/Moderations/ModerationCategory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ internal ModerationCategory(bool flagged, float score, ModerationApplicableInput
1717
public float Score { get; }
1818

1919
/// <summary> The kinds of inputs that the score is applicable to. </summary>
20-
public ModerationApplicableInputKinds ApplicableInputKinds { get; }
20+
internal ModerationApplicableInputKinds ApplicableInputKinds { get; }
2121
}

src/Custom/Moderations/OpenAIModerationsModelFactory.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ public static partial class OpenAIModerationsModelFactory
88
{
99
/// <summary> Initializes a new instance of <see cref="OpenAI.Moderations.ModerationCategory"/>. </summary>
1010
/// <returns> A new <see cref="OpenAI.Moderations.ModerationCategory"/> instance for mocking. </returns>
11-
public static ModerationCategory ModerationCategory(bool flagged = default, float score = default, ModerationApplicableInputKinds applicableInputKinds = 0)
11+
public static ModerationCategory ModerationCategory(bool flagged = default, float score = default)
1212
{
13-
return new ModerationCategory(flagged, score, applicableInputKinds);
13+
return new ModerationCategory(flagged, score, ModerationApplicableInputKinds.None);
1414
}
1515

1616
/// <summary> Initializes a new instance of <see cref="OpenAI.Moderations.ModerationResultCollection"/>. </summary>

tests/Moderations/ModerationSmokeTests.cs

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -130,23 +130,26 @@ public async Task ClassifyMultipleInputsSmokeTest()
130130

131131
Assert.That(moderations[0], Is.Not.Null);
132132
Assert.That(moderations[0].Flagged, Is.False);
133-
Assert.That(moderations[0].Violence.ApplicableInputKinds.HasFlag(ModerationApplicableInputKinds.Text), Is.False);
133+
// TODO: Uncomment.
134+
//Assert.That(moderations[0].Violence.ApplicableInputKinds.HasFlag(ModerationApplicableInputKinds.Text), Is.False);
134135

135136
Assert.That(moderations[1], Is.Not.Null);
136137
Assert.That(moderations[1].Flagged, Is.True);
137138
Assert.That(moderations[1].Violence.Flagged, Is.True);
138139
Assert.That(moderations[1].Violence.Score, Is.EqualTo(0.5f));
139-
Assert.That(moderations[1].Violence.ApplicableInputKinds.HasFlag(ModerationApplicableInputKinds.Text), Is.True);
140-
Assert.That(moderations[1].Violence.ApplicableInputKinds.HasFlag(ModerationApplicableInputKinds.Image), Is.False);
141-
Assert.That(moderations[1].Violence.ApplicableInputKinds.HasFlag(ModerationApplicableInputKinds.Other), Is.False);
140+
// TODO: Uncomment.
141+
//Assert.That(moderations[1].Violence.ApplicableInputKinds.HasFlag(ModerationApplicableInputKinds.Text), Is.True);
142+
//Assert.That(moderations[1].Violence.ApplicableInputKinds.HasFlag(ModerationApplicableInputKinds.Image), Is.False);
143+
//Assert.That(moderations[1].Violence.ApplicableInputKinds.HasFlag(ModerationApplicableInputKinds.Other), Is.False);
142144

143145
Assert.That(moderations[2], Is.Not.Null);
144146
Assert.That(moderations[2].Flagged, Is.True);
145147
Assert.That(moderations[2].Illicit.Flagged, Is.True);
146148
Assert.That(moderations[2].Illicit.Score, Is.EqualTo(0.42f));
147-
Assert.That(moderations[2].Illicit.ApplicableInputKinds.HasFlag(ModerationApplicableInputKinds.Text), Is.False);
148-
Assert.That(moderations[2].Illicit.ApplicableInputKinds.HasFlag(ModerationApplicableInputKinds.Image), Is.True);
149-
Assert.That(moderations[2].Illicit.ApplicableInputKinds.HasFlag(ModerationApplicableInputKinds.Other), Is.True);
149+
// TODO: Uncomment.
150+
//Assert.That(moderations[2].Illicit.ApplicableInputKinds.HasFlag(ModerationApplicableInputKinds.Text), Is.False);
151+
//Assert.That(moderations[2].Illicit.ApplicableInputKinds.HasFlag(ModerationApplicableInputKinds.Image), Is.True);
152+
//Assert.That(moderations[2].Illicit.ApplicableInputKinds.HasFlag(ModerationApplicableInputKinds.Other), Is.True);
150153
}
151154

152155
[Test]

0 commit comments

Comments
 (0)