@@ -11,7 +11,7 @@ namespace ElevenLabs
1111 /// <summary>
1212 /// Represents authentication for ElevenLabs
1313 /// </summary>
14- public sealed class ElevenLabsAuthentication : AbstractAuthentication < ElevenLabsAuthentication , ElevenLabsAuthInfo >
14+ public sealed class ElevenLabsAuthentication : AbstractAuthentication < ElevenLabsAuthentication , ElevenLabsAuthInfo , ElevenLabsConfiguration >
1515 {
1616 internal const string CONFIG_FILE = ".elevenlabs" ;
1717 private const string ELEVEN_LABS_API_KEY = nameof ( ELEVEN_LABS_API_KEY ) ;
@@ -23,30 +23,35 @@ public sealed class ElevenLabsAuthentication : AbstractAuthentication<ElevenLabs
2323 public static implicit operator ElevenLabsAuthentication ( string apiKey ) => new ElevenLabsAuthentication ( apiKey ) ;
2424
2525 /// <summary>
26- /// Instantiates a new Authentication object that will load the default config .
26+ /// Instantiates an empty Authentication object.
2727 /// </summary>
28- public ElevenLabsAuthentication ( )
29- {
30- if ( cachedDefault != null ) { return ; }
31-
32- cachedDefault = ( LoadFromAsset < ElevenLabsConfiguration > ( ) ??
33- LoadFromDirectory ( ) ) ??
34- LoadFromDirectory ( Environment . GetFolderPath ( Environment . SpecialFolder . UserProfile ) ) ??
35- LoadFromEnvironment ( ) ;
36- Info = cachedDefault ? . Info ;
37- }
28+ public ElevenLabsAuthentication ( ) { }
3829
3930 /// <summary>
4031 /// Instantiates a new Authentication object with the given <paramref name="apiKey"/>, which may be <see langword="null"/>.
4132 /// </summary>
4233 /// <param name="apiKey">The API key, required to access the API endpoint.</param>
43- public ElevenLabsAuthentication ( string apiKey ) => Info = new ElevenLabsAuthInfo ( apiKey ) ;
34+ public ElevenLabsAuthentication ( string apiKey )
35+ {
36+ Info = new ElevenLabsAuthInfo ( apiKey ) ;
37+ cachedDefault = this ;
38+ }
4439
4540 /// <summary>
4641 /// Instantiates a new Authentication object with the given <paramref name="authInfo"/>, which may be <see langword="null"/>.
4742 /// </summary>
4843 /// <param name="authInfo"></param>
49- public ElevenLabsAuthentication ( ElevenLabsAuthInfo authInfo ) => this . Info = authInfo ;
44+ public ElevenLabsAuthentication ( ElevenLabsAuthInfo authInfo )
45+ {
46+ Info = authInfo ;
47+ cachedDefault = this ;
48+ }
49+
50+ /// <summary>
51+ /// Instantiates a new Authentication object with the given <see cref="configuration"/>.
52+ /// </summary>
53+ /// <param name="configuration"><see cref="ElevenLabsConfiguration"/>.</param>
54+ public ElevenLabsAuthentication ( ElevenLabsConfiguration configuration ) : this ( configuration . ApiKey ) { }
5055
5156 /// <inheritdoc />
5257 public override ElevenLabsAuthInfo Info { get ; }
@@ -60,23 +65,21 @@ public ElevenLabsAuthentication()
6065 /// </summary>
6166 public static ElevenLabsAuthentication Default
6267 {
63- get => cachedDefault ?? new ElevenLabsAuthentication ( ) ;
68+ get => cachedDefault ?? new ElevenLabsAuthentication ( ) . LoadDefault ( ) ;
6469 internal set => cachedDefault = value ;
6570 }
6671
67- [ Obsolete ( "Use ElevenLabsAuthentication.Info.ApiKey" ) ]
68- public string ApiKey => Info . ApiKey ;
69-
7072 /// <inheritdoc />
71- public override ElevenLabsAuthentication LoadFromAsset < T > ( )
72- => Resources . LoadAll < T > ( string . Empty )
73- . Where ( asset => asset != null )
74- . Where ( asset => asset is ElevenLabsConfiguration config &&
75- ! string . IsNullOrWhiteSpace ( config . ApiKey ) )
76- . Select ( asset => asset is ElevenLabsConfiguration config
77- ? new ElevenLabsAuthentication ( config . ApiKey )
78- : null )
79- . FirstOrDefault ( ) ;
73+ public override ElevenLabsAuthentication LoadFromAsset ( ElevenLabsConfiguration configuration = null )
74+ {
75+ if ( configuration == null )
76+ {
77+ Debug . LogWarning ( $ "This can be speed this up by passing a { nameof ( ElevenLabsConfiguration ) } to the { nameof ( ElevenLabsAuthentication ) } .ctr") ;
78+ configuration = Resources . LoadAll < ElevenLabsConfiguration > ( string . Empty ) . FirstOrDefault ( o => o != null ) ;
79+ }
80+
81+ return configuration != null ? new ElevenLabsAuthentication ( configuration ) : null ;
82+ }
8083
8184 /// <inheritdoc />
8285 public override ElevenLabsAuthentication LoadFromEnvironment ( )
@@ -94,11 +97,16 @@ public override ElevenLabsAuthentication LoadFromDirectory(string directory = nu
9497 directory = Environment . CurrentDirectory ;
9598 }
9699
100+ if ( string . IsNullOrWhiteSpace ( filename ) )
101+ {
102+ filename = CONFIG_FILE ;
103+ }
104+
97105 ElevenLabsAuthInfo tempAuthInfo = null ;
98106
99107 var currentDirectory = new DirectoryInfo ( directory ) ;
100108
101- while ( tempAuthInfo == null && currentDirectory . Parent != null )
109+ while ( tempAuthInfo == null && currentDirectory ? . Parent != null )
102110 {
103111 var filePath = Path . Combine ( currentDirectory . FullName , filename ) ;
104112
@@ -126,12 +134,11 @@ public override ElevenLabsAuthentication LoadFromDirectory(string directory = nu
126134 var part = parts [ i ] ;
127135 var nextPart = parts [ i + 1 ] ;
128136
129- switch ( part )
137+ apiKey = part switch
130138 {
131- case ELEVEN_LABS_API_KEY :
132- apiKey = nextPart . Trim ( ) ;
133- break ;
134- }
139+ ELEVEN_LABS_API_KEY => nextPart . Trim ( ) ,
140+ _ => apiKey
141+ } ;
135142 }
136143 }
137144
@@ -148,16 +155,7 @@ public override ElevenLabsAuthentication LoadFromDirectory(string directory = nu
148155 }
149156 }
150157
151- if ( tempAuthInfo == null ||
152- string . IsNullOrEmpty ( tempAuthInfo . ApiKey ) )
153- {
154- return null ;
155- }
156-
157- return new ElevenLabsAuthentication ( tempAuthInfo ) ;
158+ return string . IsNullOrEmpty ( tempAuthInfo ? . ApiKey ) ? null : new ElevenLabsAuthentication ( tempAuthInfo ) ;
158159 }
159-
160- [ Obsolete ( "use ElevenLabsAuthentication.Default.LoadFromEnvironment" ) ]
161- public static ElevenLabsAuthentication LoadFromEnv ( ) => Default . LoadFromEnvironment ( ) ;
162160 }
163161}
0 commit comments