Skip to content

Commit ca9d361

Browse files
mediumTajmediumTaj
committed
fixes #24 - Removed support for Microformats via HTML and Feed detectionm via HTML, logging start of test of each service, complete alchemy abstraction
1 parent 5cc49f7 commit ca9d361

File tree

2 files changed

+61
-10
lines changed

2 files changed

+61
-10
lines changed

‎Scripts/Services/AlchemyAPI/AlchemyLanguage.cs

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -564,14 +564,16 @@ private void OnGetEntitiesResponse(RESTConnector.Request req, RESTConnector.Resp
564564
}
565565
else if(Path.GetExtension(normalizedSource).EndsWith(".html") && !normalizedSource.StartsWith("http://") && !normalizedSource.StartsWith("https://"))
566566
{
567-
service = SERVICE_DETECT_FEEDS_HTML;
568-
string htmlData = default(string);
569-
htmlData = File.ReadAllText(source);
570-
req.Forms["html"] = new RESTConnector.Form(htmlData);
567+
Log.Error("Alchemy Language", "A URL source is required for DetectFeeds!");
568+
return false;
569+
// service = SERVICE_DETECT_FEEDS_HTML;
570+
// string htmlData = default(string);
571+
// htmlData = File.ReadAllText(source);
572+
// req.Forms["html"] = new RESTConnector.Form(htmlData);
571573
}
572574
else
573575
{
574-
Log.Error("Alchemy Language", "Either a URL or a html page source is required for DetectFeeds!");
576+
Log.Error("Alchemy Language", "A URL source is required for DetectFeeds!");
575577
return false;
576578
}
577579

@@ -838,14 +840,16 @@ private void OnGetLanguagesResponse(RESTConnector.Request req, RESTConnector.Res
838840
}
839841
else if(Path.GetExtension(normalizedSource).EndsWith(".html") && !normalizedSource.StartsWith("http://") && !normalizedSource.StartsWith("https://"))
840842
{
841-
service = SERVICE_GET_MICROFORMAT_HTML;
842-
string htmlData = default(string);
843-
htmlData = File.ReadAllText(source);
844-
req.Forms["html"] = new RESTConnector.Form(htmlData);
843+
Log.Error("Alchemy Language", "A URL source is required for GetMicroformats!");
844+
return false;
845+
// service = SERVICE_GET_MICROFORMAT_HTML;
846+
// string htmlData = default(string);
847+
// htmlData = File.ReadAllText(source);
848+
// req.Forms["html"] = new RESTConnector.Form(htmlData);
845849
}
846850
else
847851
{
848-
Log.Error("Alchemy Language", "Either a URL or a html page source is required for GetMicroformats!");
852+
Log.Error("Alchemy Language", "A URL source is required for GetMicroformats!");
849853
return false;
850854
}
851855

‎Scripts/UnitTests/TestAlchemyLanguage.cs

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,207 +102,254 @@ public override IEnumerator RunTest()
102102
string example_microformats_html = Application.dataPath + "/Watson/Examples/ServiceExamples/TestData/microformats.html";
103103
string example_feed_html = Application.dataPath + "/Watson/Examples/ServiceExamples/TestData/ycombinator_news.html";
104104

105+
Log.Debug("TestAlchemyLanguage", "Attempting GetAuthors URL");
105106
m_AlchemyLanguage.GetAuthors(OnGetAuthorsURL, m_ExampleURL_article, "OnGetAuthorsURL");
106107
while(!m_GetAuthorsURLTested)
107108
yield return null;
108109

110+
Log.Debug("TestAlchemyLanguage", "Attempting GetAuthors HTML");
109111
m_AlchemyLanguage.GetAuthors(OnGetAuthorsHTML, example_article_html, "OnGetAuthorsHTML");
110112
while(!m_GetAuthorsHTMLTested)
111113
yield return null;
112114

113115

116+
Log.Debug("TestAlchemyLanguage", "Attempting GetRankedConcepts HTML");
114117
m_AlchemyLanguage.GetRankedConcepts(OnGetRankedConceptsHTML, example_article_html, 8, true, true, true, "OnGetRankedConceptsHTML");
115118
while(!m_GetRankedConceptsHTMLTested)
116119
yield return null;
117120

121+
Log.Debug("TestAlchemyLanguage", "Attempting GetRankedConcepts URL");
118122
m_AlchemyLanguage.GetRankedConcepts(OnGetRankedConceptsURL, m_ExampleURL_article, 8, true, true, true, "OnGetRankedConceptsURL");
119123
while(!m_GetRankedConceptsHTMLTested)
120124
yield return null;
121125

126+
Log.Debug("TestAlchemyLanguage", "Attempting GetRankedConcepts Text");
122127
m_AlchemyLanguage.GetRankedConcepts(OnGetRankedConceptsText, m_ExampleText_article, 8, true, true, true, "OnGetRankedConceptsText");
123128
while(!m_GetRankedConceptsHTMLTested)
124129
yield return null;
125130

126131

132+
Log.Debug("TestAlchemyLanguage", "Attempting GetDates URL");
127133
m_AlchemyLanguage.GetDates(OnGetDatesURL, m_ExampleURL_article, null, true, "OnGetDatesURL");
128134
while(!m_GetDatesURLTested)
129135
yield return null;
130136

137+
Log.Debug("TestAlchemyLanguage", "Attempting GetDates Text");
131138
m_AlchemyLanguage.GetDates(OnGetDatesText, m_ExampleText_article, null, true, "OnGetDatesText");
132139
while(!m_GetDatesTextTested)
133140
yield return null;
134141

142+
Log.Debug("TestAlchemyLanguage", "Attempting GetDates HTML");
135143
m_AlchemyLanguage.GetDates(OnGetDatesHTML, example_article_html, null, true, "OnGetDatesHTML");
136144
while(!m_GetDatesHTMLTested)
137145
yield return null;
138146

139147

148+
Log.Debug("TestAlchemyLanguage", "Attempting GetDates URL");
140149
m_AlchemyLanguage.GetEmotions(OnGetEmotionsURL, m_ExampleURL_article, true, "OnGetEmotionsURL");
141150
while(!m_GetEmotionURLTested)
142151
yield return null;
143152

153+
Log.Debug("TestAlchemyLanguage", "Attempting GetDates Text");
144154
m_AlchemyLanguage.GetEmotions(OnGetEmotionsText, m_ExampleText_article, true, "OnGetEmotionsText");
145155
while(!m_GetEmotionTextTested)
146156
yield return null;
147157

158+
Log.Debug("TestAlchemyLanguage", "Attempting GetDates HTML");
148159
m_AlchemyLanguage.GetEmotions(OnGetEmotionsHTML, example_article_html, true, "OnGetEmotionsHTML");
149160
while(!m_GetEmotionHTMLTested)
150161
yield return null;
151162

152163

164+
Log.Debug("TestAlchemyLanguage", "Attempting ExtractEntities URL");
153165
m_AlchemyLanguage.ExtractEntities(OnExtractEntitiesURL, m_ExampleURL_article);
154166
while(!m_GetEntityExtractionURLTested)
155167
yield return null;
156168

169+
Log.Debug("TestAlchemyLanguage", "Attempting ExtractEntities Text");
157170
m_AlchemyLanguage.ExtractEntities(OnExtractEntitiesText, m_ExampleText_article, 50, true, true, true, true, true, true, true, true, "OnExtractEntitiesText");
158171
while(!m_GetEntityExtractionTextTested)
159172
yield return null;
160173

174+
Log.Debug("TestAlchemyLanguage", "Attempting ExtractEntities HTML");
161175
m_AlchemyLanguage.ExtractEntities(OnExtractEntitiesHTML, example_article_html, 50, true, true, true, true, true, true, true, true, "OnExtractEntitiesHTML");
162176
while(!m_GetEntityExtractionHTMLTested)
163177
yield return null;
164178

165179

180+
Log.Debug("TestAlchemyLanguage", "Attempting DetectFeeds URL");
166181
m_AlchemyLanguage.DetectFeeds(OnDetectFeedsURL, m_ExampleURL_feed, "OnDetectFeedsURL");
167182
while(!m_DetectFeedsURLTested)
168183
yield return null;
169184

185+
// Log.Debug("TestAlchemyLanguage", "Attempting DetectFeeds HTML");
170186
// m_AlchemyLanguage.DetectFeeds(OnDetectFeedsHTML, example_feed_html, "OnDetectFeedsHTML");
171187
// while(!m_DetectFeedsHTMLTested)
172188
// yield return null;
173189

174190

191+
Log.Debug("TestAlchemyLanguage", "Attempting ExtractKeywords URL");
175192
m_AlchemyLanguage.ExtractKeywords(OnExtractKeywordsURL, m_ExampleURL_article, 50, true, true, true, "OnExtractKeywordsURL");
176193
while(!m_GetKeywordExtractionURLTested)
177194
yield return null;
178195

196+
Log.Debug("TestAlchemyLanguage", "Attempting ExtractKeywords Text");
179197
m_AlchemyLanguage.ExtractKeywords(OnExtractKeywordsText, m_ExampleText_article, 50, true, true, true, "OnExtractKeywordsText");
180198
while(!m_GetKeywordExtractionTextTested)
181199
yield return null;
182200

201+
Log.Debug("TestAlchemyLanguage", "Attempting ExtractKeywords HTML");
183202
m_AlchemyLanguage.ExtractKeywords(OnExtractKeywordsHTML, example_article_html, 50, true, true, true, "OnExtractKeywordsHTML");
184203
while(!m_GetKeywordExtractionHTMLTested)
185204
yield return null;
186205

187206

207+
Log.Debug("TestAlchemyLanguage", "Attempting GetLanguages URL");
188208
m_AlchemyLanguage.GetLanguages(OnGetLanguagesURL, m_ExampleURL_article, true, "OnGetLanguagesURL");
189209
while(!m_GetLanguageURLTested)
190210
yield return null;
191211

212+
Log.Debug("TestAlchemyLanguage", "Attempting GetLanguages Text");
192213
m_AlchemyLanguage.GetLanguages(OnGetLanguagesText, m_ExampleText_article, true, "OnGetLanguagesText");
193214
while(!m_GetLanguageTextTested)
194215
yield return null;
195216

217+
Log.Debug("TestAlchemyLanguage", "Attempting GetLanguages HTML");
196218
m_AlchemyLanguage.GetLanguages(OnGetLanguagesHTML, example_article_html, true, "OnGetLanguagesHTML");
197219
while(!m_GetLanguageHTMLTested)
198220
yield return null;
199221

200222

223+
Log.Debug("TestAlchemyLanguage", "Attempting GetMicroformats URL");
201224
m_AlchemyLanguage.GetMicroformats(OnGetMicroformatsURL, m_ExampleURL_microformats, "OnGetMicroformatsURL");
202225
while(!m_GetMicroformatURLTested)
203226
yield return null;
204227

228+
// Log.Debug("TestAlchemyLanguage", "Attempting GetMicroformats HTML");
205229
// m_AlchemyLanguage.GetMicroformats(OnGetMicroformatsHTML, example_microformats_html, "OnGetMicroformatsHTML");
206230
// while(!m_GetMicroformatHTMLTested)
207231
// yield return null;
208232

209233

234+
Log.Debug("TestAlchemyLanguage", "Attempting GetPublicationDate URL");
210235
m_AlchemyLanguage.GetPublicationDate(OnGetPublicationDateURL, m_ExampleURL_article, "OnGetPublicationDateURL");
211236
while(!m_GetPubDateURLTested)
212237
yield return null;
213238

239+
Log.Debug("TestAlchemyLanguage", "Attempting GetPublicationDate HTML");
214240
m_AlchemyLanguage.GetPublicationDate(OnGetPublicationDateHTML, example_article_html, "OnGetPublicationDateHTML");
215241
while(!m_GetPubldateHTMLTested)
216242
yield return null;
217243

218244

245+
Log.Debug("TestAlchemyLanguage", "Attempting GetRelations URL");
219246
m_AlchemyLanguage.GetRelations(OnGetRelationsURL, m_ExampleURL_article, 50, true, true, true, true, true, true, true, true, true, true, "OnGetRelationsURL");
220247
while(!m_GetRelationsURLTested)
221248
yield return null;
222249

250+
Log.Debug("TestAlchemyLanguage", "Attempting GetRelations Text");
223251
m_AlchemyLanguage.GetRelations(OnGetRelationsText, m_ExampleText_article, 50, true, true, true, true, true, true, true, true, true, true, "OnGetRelationsText");
224252
while(!m_GetRelationsTextTested)
225253
yield return null;
226254

255+
Log.Debug("TestAlchemyLanguage", "Attempting GetRelations HTML");
227256
m_AlchemyLanguage.GetRelations(OnGetRelationsHTML, example_article_html, 50, true, true, true, true, true, true, true, true, true, true, "OnGetRelationsHTML");
228257
while(!m_GetRelationsHTMLTested)
229258
yield return null;
230259

231260

261+
Log.Debug("TestAlchemyLanguage", "Attempting GetTextSentiment URL");
232262
m_AlchemyLanguage.GetTextSentiment(OnGetTextSentimentURL, m_ExampleURL_article, true, "OnGetTextSentimentURL");
233263
while(!m_GetTextSentimentURLTested)
234264
yield return null;
235265

266+
Log.Debug("TestAlchemyLanguage", "Attempting GetTextSentiment Text");
236267
m_AlchemyLanguage.GetTextSentiment(OnGetTextSentimentText, m_ExampleText_article, true, "OnGetTextSentimentText");
237268
while(!m_GetTextSentimentTextTested)
238269
yield return null;
239270

271+
Log.Debug("TestAlchemyLanguage", "Attempting GetTextSentiment HTML");
240272
m_AlchemyLanguage.GetTextSentiment(OnGetTextSentimentHTML, example_article_html, true, "OnGetTextSentimentHTML");
241273
while(!m_GetTextSentimentHTMLTested)
242274
yield return null;
243275

244276

277+
Log.Debug("TestAlchemyLanguage", "Attempting GetTargetedSentiment URL");
245278
m_AlchemyLanguage.GetTargetedSentiment(OnGetTargetedSentimentURL, m_ExampleURL_article, "Jeopardy|Jennings|Watson", true, "OnGetTargetedSentimentURL");
246279
while(!m_GetTargetedSentimentURLTested)
247280
yield return null;
248281

282+
Log.Debug("TestAlchemyLanguage", "Attempting GetTargetedSentiment Text");
249283
m_AlchemyLanguage.GetTargetedSentiment(OnGetTargetedSentimentText, m_ExampleText_article, "Jeopardy|Jennings|Watson", true, "OnGetTargetedSentimentText");
250284
while(!m_GetTargetedSentimentTextTested)
251285
yield return null;
252286

287+
Log.Debug("TestAlchemyLanguage", "Attempting GetTargetedSentiment HTML");
253288
m_AlchemyLanguage.GetTargetedSentiment(OnGetTargetedSentimentHTML, example_article_html, "Jeopardy|Jennings|Watson", true, "OnGetTargetedSentimentHTML");
254289
while(!m_GetTargetedSentimentHTMLTested)
255290
yield return null;
256291

257292

293+
Log.Debug("TestAlchemyLanguage", "Attempting GetRankedTaxonomy URL");
258294
m_AlchemyLanguage.GetRankedTaxonomy(OnGetRankedTaxonomyURL, m_ExampleURL_article, true, "OnGetRankedTaxonomyURL");
259295
while(!m_GetRankedTaxonomyURLTested)
260296
yield return null;
261297

298+
Log.Debug("TestAlchemyLanguage", "Attempting GetRankedTaxonomy Text");
262299
m_AlchemyLanguage.GetRankedTaxonomy(OnGetRankedTaxonomyText, m_ExampleText_article, true, "OnGetRankedTaxonomyText");
263300
while(!m_GetRankedTaxonomyTextTested)
264301
yield return null;
265302

303+
Log.Debug("TestAlchemyLanguage", "Attempting GetRankedTaxonomy HTML");
266304
m_AlchemyLanguage.GetRankedTaxonomy(OnGetRankedTaxonomyHTML, example_article_html, true, "OnGetRankedTaxonomyHTML");
267305
while(!m_GetRankedTaxonomyHTMLTested)
268306
yield return null;
269307

270308

309+
Log.Debug("TestAlchemyLanguage", "Attempting GetText HTML");
271310
m_AlchemyLanguage.GetText(OnGetTextHTML, example_article_html, true, true, "OnGetTextHTML");
272311
while(!m_GetTextHTMLTested)
273312
yield return null;
274313

314+
Log.Debug("TestAlchemyLanguage", "Attempting GetText URL");
275315
m_AlchemyLanguage.GetText(OnGetTextURL, m_ExampleURL_article, true, true, "OnGetTextURL");
276316
while(!m_GetTextURLTested)
277317
yield return null;
278318

279319

320+
Log.Debug("TestAlchemyLanguage", "Attempting GetRawText HTML");
280321
m_AlchemyLanguage.GetRawText(OnGetRawTextHTML, example_article_html, "OnGetTextHTML");
281322
while(!m_GetRawTextHTMLTested)
282323
yield return null;
283324

325+
Log.Debug("TestAlchemyLanguage", "Attempting GetRawText URL");
284326
m_AlchemyLanguage.GetRawText(OnGetRawTextURL, m_ExampleURL_article, "OnGetTextURL");
285327
while(!m_GetRawTextURLTested)
286328
yield return null;
287329

288330

331+
Log.Debug("TestAlchemyLanguage", "Attempting GetTitle HTML");
289332
m_AlchemyLanguage.GetTitle(OnGetTitleHTML, example_article_html, true, "OnGetTitleHTML");
290333
while(!m_GetTitleHTMLTested)
291334
yield return null;
292335

336+
Log.Debug("TestAlchemyLanguage", "Attempting GetTitle URL");
293337
m_AlchemyLanguage.GetTitle(OnGetTitleURL, m_ExampleURL_article, true, "OnGetTitleURL");
294338
while(!m_GetTitleURLTested)
295339
yield return null;
296340

297341

342+
Log.Debug("TestAlchemyLanguage", "Attempting GetCombinedData URL");
298343
m_AlchemyLanguage.GetCombinedData(OnGetCombinedDataURL, m_ExampleURL_article, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, "OnGetCombinedDataURL");
299344
while(!m_GetCombinedDataURLTested)
300345
yield return null;
301346

347+
Log.Debug("TestAlchemyLanguage", "Attempting GetCombinedData Text");
302348
m_AlchemyLanguage.GetCombinedData(OnGetCombinedDataText, m_ExampleText_article, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, "OnGetCombinedDataText");
303349
while(!m_GetCombinedDataTextTested)
304350
yield return null;
305351

352+
Log.Debug("TestAlchemyLanguage", "Attempting GetCombinedData HTML");
306353
m_AlchemyLanguage.GetCombinedData(OnGetCombinedDataHTML, example_article_html, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, "OnGetCombinedDataHTML");
307354
while(!m_GetCombinedDataHTMLTested)
308355
yield return null;

0 commit comments

Comments
 (0)