deva 1.2.1__tar.gz → 1.2.3__tar.gz

{deva-1.2.1 → deva-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deva
-Version: 1.2.1
+Version: 1.2.3
 Summary: data eval in future
 Home-page: https://github.com/sostc/deva
 Author: spark

{deva-1.2.1 → deva-1.2.3}/deva/__init__.py

@@ -25,4 +25,4 @@ try:
 except ImportError:
     pass
 
-__version__ = '1.2.1'
+__version__ = '1.2.3'

{deva-1.2.1 → deva-1.2.3}/deva/core.py

@@ -399,27 +399,28 @@ class Stream(object):
         This is typically done only at source Streams but can theortically be
         done at any point
         """
-        ts_async = getattr(thread_state, 'asynchronous', False)
-        if self.loop is None or asynchronous or self.asynchronous or ts_async:
-            if not ts_async:
-                thread_state.asynchronous = True
-            try:
-                result = self._emit(x)
-                if self.loop:
-                    return gen.convert_yielded(result)
-            finally:
-                thread_state.asynchronous = ts_async
-        else:
-            @gen.coroutine
-            def _():
-                thread_state.asynchronous = True
-                try:
-                    result = yield self._emit(x)
-                finally:
-                    del thread_state.asynchronous
-
-                raise gen.Return(result)
-            sync(self.loop, _)
+        # ts_async = getattr(thread_state, 'asynchronous', False)
+        # if self.loop is None or asynchronous or self.asynchronous or ts_async:
+        #     if not ts_async:
+        #         thread_state.asynchronous = True
+        #     try:
+        #         result = self.update(x)
+        #         if self.loop:
+        #             return gen.convert_yielded(result)
+        #     finally:
+        #         thread_state.asynchronous = ts_async
+        # else:
+        #     @gen.coroutine
+        #     def _():
+        #         thread_state.asynchronous = True
+        #         try:
+        #             result = yield self.update(x)
+        #         finally:
+        #             del thread_state.asynchronous
+
+        #         raise gen.Return(result)
+        #     sync(self.loop, _)
+        self.update(x)
 
     def update(self, x, who=None):
         try:
@@ -544,19 +545,16 @@ class Stream(object):
         from .graph import visualize
         return visualize(self, filename, source_node=source_node, **kwargs)
 
-    def attend(self, x):
-        """#async等将执行结果入流"""
-        assert isinstance(x, gen.Awaitable)
-        futs = gen.convert_yielded(x)
-        self.loop = self.loop or get_io_loop()
-        self.loop.add_future(futs, lambda x: self._emit(x.result()))
+    # def attend(self, x):
+    #     """#async等将执行结果入流"""
+    #     assert isinstance(x, gen.Awaitable)
+    #     futs = gen.convert_yielded(x)
+    #     self.loop = self.loop or get_io_loop()
+    #     self.loop.add_future(futs, lambda x: self._emit(x.result()))
 
     def __ror__(self, x):  # |
         """emit value to stream ,end,return emit result"""
-        if isinstance(x, gen.Awaitable):
-            self.attend(x)
-        else:
-            self.emit(x, asynchronous=False)
+        self.emit(x, asynchronous=False)
         return x
 
     def __rrshift__(self, x):  # stream左边的>>
@@ -1205,12 +1203,17 @@ class Deva():
         # loop.make_current()
         # loop.start()
 
-        loop = get_io_loop(asynchronous=False)
-        loop.instance().start()
+        # loop = get_io_loop(asynchronous=False)
+        # loop.instance().start()
+
         # import asyncio
         # l = asyncio.new_event_loop()
 
         # l.run_forever()
+        try:
+            IOLoop().start()
+        except KeyboardInterrupt:
+            exit()
 
 
 print(os.getpid())

{deva-1.2.1 → deva-1.2.3}/deva/sample/crawler/asynchttp.py

@@ -2,12 +2,12 @@ from deva import *
 
 h = http()
 h.map(lambda r: (r.url, r.html.search('<title>{}</title>')[0])) >> log
-'http://www.518.is' >> h
+'http://secsay.com' >> h
 
 
 s = Stream()
 s.rate_limit(1).http(workers=20).map(lambda r: (
     r.url, r.html.search('<title>{}</title>')[0])) >> warn
-'http://www.518.is' >> s
+'http://secsay.com' >> s
 
 Deva.run()

{deva-1.2.1 → deva-1.2.3}/deva/sample/my_future.py

@@ -34,7 +34,7 @@ foo1() | print
 
 foo2() | log
 
-foo2() | attend()
+
 name = "Masnun"
 
 # IPython.embed()

{deva-1.2.1 → deva-1.2.3}/deva/sample/search/search_sql.py

@@ -36,6 +36,6 @@ session.add(log)
 session.commit()
 
 
-CpipLog.search_query('tensorflow') >> first
+CpipLog.search_query('tensorflow') >> first >> print
 
-CpipLog.search_query('tensorflow') >> ls
+CpipLog.search_query('tensorflow') >> ls >> print

{deva-1.2.1 → deva-1.2.3}/deva/sample/webview/stream_page.py

@@ -25,5 +25,5 @@ s2.webview()
 s2.webview('/stock')
 s3.webview()
 
-Monitor().start()
+# Monitor().start()
 Deva.run()

{deva-1.2.1 → deva-1.2.3}/deva/when.py

@@ -150,9 +150,9 @@ class timer(Stream):
                 self.stop()
 
             if self.thread:
-                self.thread_pool.submit(lambda: self.update(self.func()))
+                self.thread_pool.submit(lambda: self.emit(self.func()))
             else:
-                self.update(self.func())
+                self.emit(self.func())
             yield gen.sleep(self.interval)
             if self.stopped:
                 break

{deva-1.2.1 → deva-1.2.3}/deva.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deva
-Version: 1.2.1
+Version: 1.2.3
 Summary: data eval in future
 Home-page: https://github.com/sostc/deva
 Author: spark

{deva-1.2.1 → deva-1.2.3}/deva.egg-info/SOURCES.txt

@@ -35,6 +35,7 @@ deva/sample/bus/bus_out.py
 deva/sample/crawler/.DS_Store
 deva/sample/crawler/asynchttp.py
 deva/sample/search/.DS_Store
+deva/sample/search/cpiplog.db
 deva/sample/search/search_sql.py
 deva/sample/search/search_stream.py
 deva/sample/webview/stream_page.py

{deva-1.2.1 → deva-1.2.3}/setup.py

@@ -3,7 +3,7 @@ from os.path import exists
 
 setup(
     name='deva',
-    version='1.2.1',
+    version='1.2.3',
     include_package_data=True,
     packages=find_packages(),
     python_requires='>=3.5',