Merge pull request #34 in LCL/wolframengineforpython from feature/client_max_size to master

* commit '5c8a04ddca3c29f7a79a24f577d879d3fc69e5b3':
  changing initfile description
  adding documentation for --domain
  adding doc for custom init file
  automatic code lint
  bumping version
  adding maximum amount for client size

Author: crazyeng

README.md

@@ -295,6 +295,34 @@ Index           index.wl
 (Press CTRL+C to quit) 
 ```
 
+#### --domain DOMAIN
+
+Allows you to specify the DOMAIN of the webserver. By default the webserver only listens to localhost, use `0.0.0.0` to listen on all network interfaces.
+
+```
+>>> python3 -m wolframwebengine --domain 0.0.0.0
+----------------------------------------------------------------------
+Address         http://0.0.0.0:18000/
+Folder          /Users/rdv/Desktop
+Index           index.wl
+----------------------------------------------------------------------
+(Press CTRL+C to quit) 
+```
+
+#### --initfile FILE
+
+Allows you to specify a custom file containing code to be run when a new kernel is started
+
+```
+>>> python3 -m wolframwebengine --initfile myinit.m
+----------------------------------------------------------------------
+Address         http://localhost:18000/
+Folder          /Users/rdv/Desktop
+Index           index.wl
+----------------------------------------------------------------------
+(Press CTRL+C to quit) 
+```
+
 #### --kernel KERNEL
 
 Allows you to specify the Kernel path
@@ -345,6 +373,19 @@ Kernel 511 is ready. Startup took 35.43 seconds.
 If the option is present the server will wait for the first request to spawn the kernels, instead of spawning them immediately.
 
 
+#### --client_max_size MB
+
+The maximum amount of megabytes allowed for file upload. Defaults to 10.
+```
+>>> python3 -m wolframwebengine --client_max_size 150
+----------------------------------------------------------------------
+Address         http://localhost:18000/
+Folder          /Users/rdv/Desktop
+Index           index.wl
+----------------------------------------------------------------------
+(Press CTRL+C to quit)
+```
+
 ## Integrating an existing application
 
 Wolfram Web Engine for Python can be used to augment an existing python application instead of creating a new one.

setup.py

@@ -22,7 +22,7 @@ def load_tests():
 
 setup(
     name = 'wolframwebengine',
-    version = '1.0.2',
+    version = '1.0.3',
     description = 'A Python library with various tools to start a wolfram engine a server content.',
     keywords=['Wolfram Language', 'Wolfram Desktop', 'Mathematica', 'Web Development', 'Wolfram Web Engine'],
     author = 'Wolfram Research, Riccardo Di Virgilio',

wolframwebengine/cli/commands/runserver.py

@@ -12,6 +12,7 @@
 from wolframclient.utils.decorators import cached_property, to_dict
 from wolframclient.utils.functional import first
 from wolframclient.utils.importutils import module_path
+
 from wolframwebengine.server.app import create_session, create_view, is_wl_code
 
 
@@ -46,7 +47,7 @@ def add_arguments(self, parser):
             default=20,
             help="Startup timeout (in seconds) for kernels in the pool.",
             type=int,
-            metavar="SECONDS"
+            metavar="SECONDS",
         )
         parser.add_argument(
             "--cached",
@@ -72,6 +73,14 @@ def add_arguments(self, parser):
             choices=tuple(self.demo_choices.keys()),
         )
 
+        parser.add_argument(
+            "--client_max_size",
+            default=10,
+            dest="client_max_size",
+            help="Maximum size of client uploads, in Mb",
+            type=float,
+        )
+
     def print_line(self, f="", s=""):
         self.print(f.ljust(15), s)
 
@@ -95,29 +104,55 @@ def demo_choices(self):
     def demo_path(self, *args):
         return module_path("wolframwebengine", "examples", "demo", *args)
 
-    def handle(self, domain, port, path, kernel, poolsize, lazy, index, demo, initfile, startuptimeout, **opts):
+    def handle(
+        self,
+        domain,
+        port,
+        path,
+        kernel,
+        poolsize,
+        lazy,
+        index,
+        demo,
+        initfile,
+        startuptimeout,
+        client_max_size,
+        **opts
+    ):
 
         if demo is None or demo:
             path = self.demo_path(self.demo_choices[demo])
 
         path = os.path.abspath(os.path.expanduser(path))
 
+        client_max_size = int(client_max_size * (1024 ** 2))
+
         try:
-            session = create_session(kernel,
-                poolsize=poolsize, initfile=initfile,
-                STARTUP_TIMEOUT=startuptimeout
+            session = create_session(
+                kernel, poolsize=poolsize, initfile=initfile, STARTUP_TIMEOUT=startuptimeout
             )
 
         except WolframKernelException as e:
             self.print(e)
             self.print("Use --help to display all available options.")
             sys.exit(1)
 
+        loop = asyncio.get_event_loop()
+
         async def main():
 
             view = create_view(session, path, index=index, **opts)
 
-            runner = self.ServerRunner(self.Server(view, access_log_class=self.AccessLogger))
+            def request_factory(*args, **opts):
+                return web.BaseRequest(
+                    *args, **opts, client_max_size=client_max_size, loop=loop
+                )
+
+            runner = self.ServerRunner(
+                self.Server(
+                    view, access_log_class=self.AccessLogger, request_factory=request_factory
+                )
+            )
             await runner.setup()
             await self.TCPSite(runner, domain, port).start()
 
@@ -160,7 +195,6 @@ async def main():
             while True:
                 await asyncio.sleep(3600)
 
-        loop = asyncio.get_event_loop()
         try:
             loop.run_until_complete(main())
         except KeyboardInterrupt:

wolframwebengine/examples/aiohttp_application.py

@@ -3,6 +3,7 @@
 from aiohttp import web
 from wolframclient.evaluation import WolframEvaluatorPool
 from wolframclient.language import wl
+
 from wolframwebengine.web import aiohttp_wl_view
 
 session = WolframEvaluatorPool(poolsize=4)

wolframwebengine/examples/djangoapp/urls.py

@@ -4,6 +4,7 @@
 from django.urls import path
 from wolframclient.evaluation import WolframLanguageSession
 from wolframclient.language import wl
+
 from wolframwebengine.web import django_wl_view
 
 session = WolframLanguageSession()

wolframwebengine/server/app.py

@@ -7,6 +7,7 @@
 from wolframclient.evaluation import WolframEvaluatorPool, WolframLanguageAsyncSession
 from wolframclient.language import wl
 from wolframclient.utils.functional import last
+
 from wolframwebengine.server.explorer import get_wl_handler_path_from_folder
 from wolframwebengine.web import aiohttp_wl_view
 

wolframwebengine/tests/application_aiohttp.py

@@ -8,6 +8,7 @@
 from wolframclient.language import wl
 from wolframclient.utils.functional import first
 from wolframclient.utils.importutils import module_path
+
 from wolframwebengine.server.app import create_session, create_view
 from wolframwebengine.web import aiohttp_wl_view
 from wolframwebengine.web.utils import auto_wait

wolframwebengine/tests/application_django.py

@@ -5,6 +5,7 @@
 from wolframclient.utils.api import json
 from wolframclient.utils.functional import first
 from wolframclient.utils.tests import TestCase as BaseTestCase
+
 from wolframwebengine.web.utils import auto_wait
 
 

wolframwebengine/tests/folder_explorer.py

@@ -4,6 +4,7 @@
 
 from wolframclient.utils.importutils import module_path
 from wolframclient.utils.tests import TestCase as BaseTestCase
+
 from wolframwebengine.server.explorer import get_wl_handler_path_from_folder
 
 

wolframwebengine/web/__init__.py

@@ -3,6 +3,7 @@
 from functools import partial
 
 from wolframclient.utils.importutils import API
+
 from wolframwebengine.web.utils import is_coroutine_function
 
 available_backends = API(

wolframwebengine/web/aiohttp.py

@@ -6,6 +6,7 @@
 from wolframclient.utils.api import aiohttp
 from wolframclient.utils.decorators import to_dict
 from wolframclient.utils.encoding import force_text
+
 from wolframwebengine.web.utils import (
     make_generate_httpresponse_expression,
     process_generate_httpresponse_expression,

wolframwebengine/web/django.py

@@ -7,6 +7,7 @@
 from wolframclient.language import wl
 from wolframclient.utils.decorators import to_dict
 from wolframclient.utils.functional import first, iterate, last
+
 from wolframwebengine.web.utils import (
     auto_wait,
     make_generate_httpresponse_expression,