minor fixes, don't require a personal tag to exist

Author: kireet

feedly/data.py

@@ -3,12 +3,12 @@
    handy getter methods, but otherwise you can just use a .json property to access the
    raw json passed back by the client.
 """
-from typing import Any, Dict, Optional
+from typing import Any, Dict, Optional, Callable
 from urllib.parse import quote_plus
 
 from feedly.protocol import APIClient
 from feedly.stream import STREAM_SOURCE_USER, StreamOptions, StreamBase, UserStreamId, EnterpriseStreamId, StreamIdBase, STREAM_SOURCE_ENTERPRISE
-
+import logging
 
 class FeedlyData:
     def __init__(self, json:Dict[str,Any], client:APIClient=None):
@@ -184,30 +184,34 @@ def get_enterprise_tags(self, refresh: bool = False) -> Dict[str, 'EnterpriseTag
 
         return self._enterprise_tags
 
-    def _get_category_or_tag(self, stream_id:StreamIdBase, cache, factory):
+    def _get_category_or_tag(self, stream_id:StreamIdBase, cache:Dict[str,Streamable], factory:Callable[[Dict[str,str]], Streamable], auto_create:bool):
         if cache:
             data = cache.get(stream_id.content_id)
             if data:
                 return data
-            raise ValueError(f'{id_} does not exist')
+
+            if not auto_create:
+                raise ValueError(f'{stream_id.id} does not exist')
+            else:
+                cache.clear()
 
         return factory({'id': stream_id.id}, self._client)
 
     def get_category(self, name:str):
         id_ = UserStreamId(parts=[STREAM_SOURCE_USER, self.id, 'category', name])
 
-        return self._get_category_or_tag(id_, self._categories, UserCategory)
+        return self._get_category_or_tag(id_, self._categories, UserCategory, False)
 
     def get_tag(self, name:str) -> 'UserTag':
         id_ = UserStreamId(parts=[STREAM_SOURCE_USER, self.id, 'tag', name])
 
-        return self._get_category_or_tag(id_, self._tags, UserTag)
+        return self._get_category_or_tag(id_, self._tags, UserTag, True)
 
     def get_enterprise_category(self, stream_id:EnterpriseStreamId) -> 'EnterpriseCategory':
-        return self._get_category_or_tag(stream_id, self._tags, EnterpriseCategory)
+        return self._get_category_or_tag(stream_id, self._tags, EnterpriseCategory, False)
 
     def get_enterprise_tag(self, stream_id:EnterpriseStreamId) -> 'EnterpriseTag':
-        return self._get_category_or_tag(stream_id, self._tags, EnterpriseTag)
+        return self._get_category_or_tag(stream_id, self._tags, EnterpriseTag, False)
 
 
 

feedly/session.py

@@ -1,3 +1,4 @@
+from pprint import pprint
 import time
 from pathlib import Path
 from typing import Dict, Any, Union, List, Optional
@@ -14,6 +15,7 @@
 
 from feedly.data import FeedlyUser
 from feedly.protocol import RateLimitedAPIError, BadRequestAPIError, UnauthorizedAPIError, ServerAPIError, APIClient, WrappedHTTPError
+from feedly.stream import StreamIdBase
 
 
 class Auth:
@@ -225,10 +227,5 @@ def do_api_request(self, relative_url:str, method:str=None, data:Dict=None,
 
         sess = FeedlySession(auth)
 
-        sess.user.get_enterprise_tags()
-        # sess.user.get_enterprise_categories()
-
-        # with FeedlySession(auth_token=token, user_id=uid) as sess:
-        #     opts = StreamOptions(max_count=30)
-        #     for i, eid in enumerate(sess.user.get_category('politics').stream_ids(opts)):
-        #         print(i, eid)
+        for k, v in sess.user.get_categories().items():
+            pprint(f"{k} -- {v['label']}")

feedly/stream.py

@@ -37,7 +37,7 @@ def is_enterprise_stream(self):
         return self.source == STREAM_SOURCE_ENTERPRISE
 
     @staticmethod
-    def from_string(self, id_:str):
+    def from_string(id_:str):
         parts = id_.split('/')
         if len(parts) < 4:
             raise ValueError(f'invalid id {id_}')
@@ -50,7 +50,7 @@ def from_string(self, id_:str):
             return StreamIdBase(id_, STREAM_SOURCE_UNKNOWN, 'unknown', 'unknown')
 
     def __repr__(self):
-        return f'StreamId: {self.id_}>'
+        return f'<stream:{self.id}>'
 
     def __str__(self):
         return self.__repr__()

setup.py

@@ -18,7 +18,7 @@
 EMAIL = 'kireet@feedly.com'
 AUTHOR = 'Kireet'
 REQUIRES_PYTHON = '>=3.6.0'
-VERSION = 0.14
+VERSION = 0.15
 
 # What packages are required for this module to be executed?
 with open('requirements.txt') as f: