- added topic pages

Author: gregorleban

eventregistry/EventRegistry.py

@@ -3,22 +3,9 @@
 """
 import six, os, sys, traceback, json, re, requests, time
 import threading
+
 from eventregistry.Base import *
-from eventregistry.EventForText import *
 from eventregistry.ReturnInfo import *
-from eventregistry.Query import *
-from eventregistry.QueryEvents import *
-from eventregistry.QueryEvent import *
-from eventregistry.QueryArticles import *
-from eventregistry.QueryArticle import *
-from eventregistry.QueryStory import *
-from eventregistry.Correlations import *
-from eventregistry.Counts import *
-from eventregistry.DailyShares import *
-from eventregistry.Info import *
-from eventregistry.Recent import *
-from eventregistry.Trends import *
-from eventregistry.Analytics import *
 
 class EventRegistry(object):
     """
@@ -347,7 +334,7 @@ def jsonRequestAnalytics(self, methodUrl, paramDict):
     #
     # suggestion methods - return type is a list of matching items
 
-    def suggestConcepts(self, prefix, sources = ["concepts"], lang = "eng", conceptLang = "eng", page = 1, count = 20, returnInfo = ReturnInfo()):
+    def suggestConcepts(self, prefix, sources = ["concepts"], lang = "eng", conceptLang = "eng", page = 1, count = 20, returnInfo = ReturnInfo(), **kwargs):
         """
         return a list of concepts that contain the given prefix. returned matching concepts are sorted based on their frequency of occurence in news (from most to least frequent)
         @param prefix: input text that should be contained in the concept
@@ -361,10 +348,11 @@ def suggestConcepts(self, prefix, sources = ["concepts"], lang = "eng", conceptL
         assert page > 0, "page parameter should be above 0"
         params = { "prefix": prefix, "source": sources, "lang": lang, "conceptLang": conceptLang, "page": page, "count": count}
         params.update(returnInfo.getParams())
+        params.update(kwargs)
         return self.jsonRequest("/json/suggestConcepts", params)
 
 
-    def suggestCategories(self, prefix, page = 1, count = 20, returnInfo = ReturnInfo()):
+    def suggestCategories(self, prefix, page = 1, count = 20, returnInfo = ReturnInfo(), **kwargs):
         """
         return a list of dmoz categories that contain the prefix
         @param prefix: input text that should be contained in the category name
@@ -375,10 +363,11 @@ def suggestCategories(self, prefix, page = 1, count = 20, returnInfo = ReturnInf
         assert page > 0, "page parameter should be above 0"
         params = { "prefix": prefix, "page": page, "count": count }
         params.update(returnInfo.getParams())
+        params.update(kwargs)
         return self.jsonRequest("/json/suggestCategories", params)
 
 
-    def suggestNewsSources(self, prefix, dataType = ["news", "pr", "blog"], page = 1, count = 20):
+    def suggestNewsSources(self, prefix, dataType = ["news", "pr", "blog"], page = 1, count = 20, **kwargs):
         """
         return a list of news sources that match the prefix
         @param prefix: input text that should be contained in the source name or uri
@@ -387,22 +376,25 @@ def suggestNewsSources(self, prefix, dataType = ["news", "pr", "blog"], page = 1
         @param count: number of returned suggestions
         """
         assert page > 0, "page parameter should be above 0"
-        params = { "prefix": prefix, "dataType": dataType, "count": count }
+        params = {"prefix": prefix, "dataType": dataType, "page": page, "count": count}
+        params.update(kwargs)
         return self.jsonRequest("/json/suggestSources", params)
 
 
-    def suggestSourceGroups(self, prefix, page = 1, count = 20):
+    def suggestSourceGroups(self, prefix, page = 1, count = 20, **kwargs):
         """
         return a list of news source groups that match the prefix
         @param prefix: input text that should be contained in the source group name or uri
         @param page:  page of the results (1, 2, ...)
         @param count: number of returned suggestions
         """
         assert page > 0, "page parameter should be above 0"
-        return self.jsonRequest("/json/suggestSourceGroups", { "prefix": prefix, "page": page, "count": count })
+        params = { "prefix": prefix, "page": page, "count": count }
+        params.update(kwargs)
+        return self.jsonRequest("/json/suggestSourceGroups", params)
 
 
-    def suggestLocations(self, prefix, sources = ["place", "country"], lang = "eng", count = 20, countryUri = None, sortByDistanceTo = None, returnInfo = ReturnInfo()):
+    def suggestLocations(self, prefix, sources = ["place", "country"], lang = "eng", count = 20, countryUri = None, sortByDistanceTo = None, returnInfo = ReturnInfo(), **kwargs):
         """
         return a list of geo locations (cities or countries) that contain the prefix
         @param prefix: input text that should be contained in the location name
@@ -415,6 +407,7 @@ def suggestLocations(self, prefix, sources = ["place", "country"], lang = "eng",
         """
         params = { "prefix": prefix, "count": count, "source": sources, "lang": lang, "countryUri": countryUri or "" }
         params.update(returnInfo.getParams())
+        params.update(kwargs)
         if sortByDistanceTo:
             assert isinstance(sortByDistanceTo, (tuple, list)), "sortByDistanceTo has to contain a tuple with latitude and longitude of the location"
             assert len(sortByDistanceTo) == 2, "The sortByDistanceTo should contain two float numbers"
@@ -423,7 +416,7 @@ def suggestLocations(self, prefix, sources = ["place", "country"], lang = "eng",
         return self.jsonRequest("/json/suggestLocations", params)
 
 
-    def suggestLocationsAtCoordinate(self, latitude, longitude, radiusKm, limitToCities = False, lang = "eng", count = 20, ignoreNonWiki = True, returnInfo = ReturnInfo()):
+    def suggestLocationsAtCoordinate(self, latitude, longitude, radiusKm, limitToCities = False, lang = "eng", count = 20, ignoreNonWiki = True, returnInfo = ReturnInfo(), **kwargs):
         """
         return a list of geo locations (cities or places) that are close to the provided (lat, long) values
         @param latitude: latitude part of the coordinate
@@ -439,10 +432,11 @@ def suggestLocationsAtCoordinate(self, latitude, longitude, radiusKm, limitToCit
         assert isinstance(longitude, (int, float)), "The 'longitude' should be a number"
         params = { "action": "getLocationsAtCoordinate", "lat": latitude, "lon": longitude, "radius": radiusKm, "limitToCities": limitToCities, "count": count, "lang": lang }
         params.update(returnInfo.getParams())
+        params.update(kwargs)
         return self.jsonRequest("/json/suggestLocations", params)
 
 
-    def suggestSourcesAtCoordinate(self, latitude, longitude, radiusKm, count = 20):
+    def suggestSourcesAtCoordinate(self, latitude, longitude, radiusKm, count = 20, **kwargs):
         """
         return a list of news sources that are close to the provided (lat, long) values
         @param latitude: latitude part of the coordinate
@@ -452,23 +446,25 @@ def suggestSourcesAtCoordinate(self, latitude, longitude, radiusKm, count = 20):
         """
         assert isinstance(latitude, (int, float)), "The 'latitude' should be a number"
         assert isinstance(longitude, (int, float)), "The 'longitude' should be a number"
-        params = { "action": "getSourcesAtCoordinate", "lat": latitude, "lon": longitude, "radius": radiusKm, "count": count }
+        params = {"action": "getSourcesAtCoordinate", "lat": latitude, "lon": longitude, "radius": radiusKm, "count": count}
+        params.update(kwargs)
         return self.jsonRequest("/json/suggestSources", params)
 
 
-    def suggestSourcesAtPlace(self, conceptUri, dataType = "news", page = 1, count = 20):
+    def suggestSourcesAtPlace(self, conceptUri, dataType = "news", page = 1, count = 20, **kwargs):
         """
         return a list of news sources that are close to the provided (lat, long) values
         @param conceptUri: concept that represents a geographic location for which we would like to obtain a list of sources located at the place
         @param dataType: type of the news source ("news", "pr", "blog" or a list of any of those)
         @param page: page of the results (1, 2, ...)
         @param count: number of returned sources
         """
-        params = { "action": "getSourcesAtPlace", "conceptUri": conceptUri, "page": page, "count": count, "dataType": dataType }
+        params = {"action": "getSourcesAtPlace", "conceptUri": conceptUri, "page": page, "count": count, "dataType": dataType}
+        params.update(kwargs)
         return self.jsonRequest("/json/suggestSources", params)
 
 
-    def suggestConceptClasses(self, prefix, lang = "eng", conceptLang = "eng", source = ["dbpedia", "custom"], page = 1, count = 20, returnInfo = ReturnInfo()):
+    def suggestConceptClasses(self, prefix, lang = "eng", conceptLang = "eng", source = ["dbpedia", "custom"], page = 1, count = 20, returnInfo = ReturnInfo(), **kwargs):
         """
         return a list of concept classes that match the given prefix
         @param prefix: input text that should be contained in the category name
@@ -482,10 +478,11 @@ def suggestConceptClasses(self, prefix, lang = "eng", conceptLang = "eng", sourc
         assert page > 0, "page parameter should be above 0"
         params = { "prefix": prefix, "lang": lang, "conceptLang": conceptLang, "source": source, "page": page, "count": count }
         params.update(returnInfo.getParams())
+        params.update(kwargs)
         return self.jsonRequest("/json/suggestConceptClasses", params)
 
 
-    def suggestCustomConcepts(self, prefix, lang = "eng", conceptLang = "eng", page = 1, count = 20, returnInfo = ReturnInfo()):
+    def suggestCustomConcepts(self, prefix, lang = "eng", conceptLang = "eng", page = 1, count = 20, returnInfo = ReturnInfo(), **kwargs):
         """
         return a list of custom concepts that contain the given prefix. Custom concepts are the things (indicators, stock prices, ...) for which we import daily trending values that can be obtained using GetCounts class
         @param prefix: input text that should be contained in the concept name
@@ -498,6 +495,7 @@ def suggestCustomConcepts(self, prefix, lang = "eng", conceptLang = "eng", page
         assert page > 0, "page parameter should be above 0"
         params = { "prefix": prefix, "lang": lang, "conceptLang": conceptLang, "page": page, "count": count }
         params.update(returnInfo.getParams())
+        params.update(kwargs)
         return self.jsonRequest("/json/suggestCustomConcepts", params)
 
 

eventregistry/QueryArticle.py

@@ -32,17 +32,6 @@ def queryByUri(articleUriOrUriList):
         return q
 
 
-    def addRequestedResult(self, requestArticle):
-        """
-        Add a result type that you would like to be returned. In one QueryArticle you can ask for multiple result types.
-        Result types can be the classes that extend RequestArticle base class (see classes below).
-        @param requestArticle: an instance of type RequestArticle*. Determines what info should be returned as a result of the query
-        """
-        assert isinstance(requestArticle, RequestArticle), "QueryArticle class can only accept result requests that are of type RequestArticle"
-        self.resultTypeList = [item for item in self.resultTypeList if item.getResultType() != requestArticle.getResultType()]
-        self.resultTypeList.append(requestArticle)
-
-
     def setRequestedResult(self, requestArticle):
         """
         Set the single result type that you would like to be returned. If some other request type was previously set, it will be overwritten.