Commit a489c9bb authored by Andrew Gibiansky's avatar Andrew Gibiansky

Merge pull request #445 from gibiansky/format-all-src

Format all src
parents c19a3bf2 7009eb0e
...@@ -36,7 +36,7 @@ install: ...@@ -36,7 +36,7 @@ install:
if [ ${GHCVER%.*} = "7.8" ]; then if [ ${GHCVER%.*} = "7.8" ]; then
travis_retry cabal install arithmoi==0.4.* -fllvm travis_retry cabal install arithmoi==0.4.* -fllvm
travis_retry git clone http://www.github.com/gibiansky/hindent travis_retry git clone http://www.github.com/gibiansky/hindent
cd hindent && cabal install && cd .. cd hindent && travis_retry cabal install && cd ..
fi fi
# Here starts the actual work to be performed for the package under test; any command which exits with a non-zero exit code causes the build to fail. # Here starts the actual work to be performed for the package under test; any command which exits with a non-zero exit code causes the build to fail.
......
{-# LANGUAGE NoImplicitPrelude, TypeSynonymInstances, QuasiQuotes #-} {-# LANGUAGE NoImplicitPrelude, TypeSynonymInstances, QuasiQuotes #-}
module IHaskell.Display.Aeson () where module IHaskell.Display.Aeson () where
import ClassyPrelude import ClassyPrelude
import Data.Textual.Encoding import Data.Textual.Encoding
import Data.Aeson import Data.Aeson
import Data.Aeson.Encode.Pretty import Data.Aeson.Encode.Pretty
import Data.String.Here import Data.String.Here
import IHaskell.Display import IHaskell.Display
instance IHaskellDisplay Value where instance IHaskellDisplay Value where
display renderable = return $ Display [plain json, html dom] display renderable = return $ Display [plain json, html dom]
where where
json = unpack $ decodeUtf8 $ encodePretty renderable json = unpack $ decodeUtf8 $ encodePretty renderable
dom = [i|<div class="highlight-code" id="javascript">${json}</div>|] dom = [i|<div class="highlight-code" id="javascript">${json}</div>|]
{-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-} {-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-}
module IHaskell.Display.Basic () where module IHaskell.Display.Basic () where
import IHaskell.Display import IHaskell.Display
import Text.Printf import Text.Printf
instance Show a => IHaskellDisplay (Maybe a) where instance Show a => IHaskellDisplay (Maybe a) where
display just = return $ Display [stringDisplay, htmlDisplay] display just = return $ Display [stringDisplay, htmlDisplay]
where where
stringDisplay = plain (show just) stringDisplay = plain (show just)
htmlDisplay = html str htmlDisplay = html str
str = case just of str =
Nothing -> "<span style='color: red; font-weight: bold;'>Nothing</span>" case just of
Just x -> printf "<span style='color: green; font-weight: bold;'>Just</span><span style='font-family: monospace;'>%s</span>" (show x) Nothing -> "<span style='color: red; font-weight: bold;'>Nothing</span>"
Just x -> printf
"<span style='color: green; font-weight: bold;'>Just</span><span style='font-family: monospace;'>%s</span>"
(show x)
{-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-} {-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-}
module IHaskell.Display.Blaze () where module IHaskell.Display.Blaze () where
import IHaskell.Display import IHaskell.Display
import Text.Printf import Text.Printf
import Text.Blaze.Html import Text.Blaze.Html
import Text.Blaze.Renderer.Pretty import Text.Blaze.Renderer.Pretty
import Text.Blaze.Internal import Text.Blaze.Internal
import Control.Monad import Control.Monad
instance IHaskellDisplay (MarkupM a) where instance IHaskellDisplay (MarkupM a) where
display val = return $ Display [stringDisplay, htmlDisplay] display val = return $ Display [stringDisplay, htmlDisplay]
where where
str = renderMarkup (void val) str = renderMarkup (void val)
stringDisplay = plain str stringDisplay = plain str
htmlDisplay = html str htmlDisplay = html str
{-# LANGUAGE NoImplicitPrelude, CPP #-} {-# LANGUAGE NoImplicitPrelude, CPP #-}
module IHaskell.Display.Charts () where module IHaskell.Display.Charts () where
import ClassyPrelude import ClassyPrelude
import System.Directory import System.Directory
import Data.Default.Class import Data.Default.Class
import Graphics.Rendering.Chart.Renderable import Graphics.Rendering.Chart.Renderable
import Graphics.Rendering.Chart.Backend.Cairo import Graphics.Rendering.Chart.Backend.Cairo
import qualified Data.ByteString.Char8 as Char import qualified Data.ByteString.Char8 as Char
import System.IO.Unsafe import System.IO.Unsafe
import IHaskell.Display import IHaskell.Display
width :: Width width :: Width
width = 450 width = 450
...@@ -22,8 +23,8 @@ instance IHaskellDisplay (Renderable a) where ...@@ -22,8 +23,8 @@ instance IHaskellDisplay (Renderable a) where
display renderable = do display renderable = do
pngDisp <- chartData renderable PNG pngDisp <- chartData renderable PNG
-- We can add `svg svgDisplay` to the output of `display`, -- We can add `svg svgDisplay` to the output of `display`, but SVGs are not resizable in the IPython
-- but SVGs are not resizable in the IPython notebook. -- notebook.
svgDisp <- chartData renderable SVG svgDisp <- chartData renderable SVG
return $ Display [pngDisp, svgDisp] return $ Display [pngDisp, svgDisp]
...@@ -34,17 +35,17 @@ chartData renderable format = do ...@@ -34,17 +35,17 @@ chartData renderable format = do
-- Write the PNG image. -- Write the PNG image.
let filename = ".ihaskell-chart.png" let filename = ".ihaskell-chart.png"
opts = def{_fo_format = format, _fo_size = (width, height)} opts = def { _fo_format = format, _fo_size = (width, height) }
toFile = renderableToFile opts mkFile opts filename renderable
-- Convert to base64.
imgData <- readFile $ fpFromString filename
return $
case format of
PNG -> png width height $ base64 imgData
SVG -> svg $ Char.unpack imgData
#if MIN_VERSION_Chart_cairo(1,3,0) #if MIN_VERSION_Chart_cairo(1,3,0)
toFile filename renderable mkFile opts filename renderable = renderableToFile opts filename renderable
#else #else
toFile renderable filename mkFile opts filename renderable = renderableToFile opts renderable filename
#endif #endif
-- Convert to base64.
imgData <- readFile $ fpFromString filename
return $ case format of
PNG -> png width height $ base64 imgData
SVG -> svg $ Char.unpack imgData
{-# LANGUAGE NoImplicitPrelude, TypeSynonymInstances, FlexibleInstances #-} {-# LANGUAGE NoImplicitPrelude, TypeSynonymInstances, FlexibleInstances #-}
module IHaskell.Display.Diagrams (diagram, animation) where module IHaskell.Display.Diagrams (diagram, animation) where
import ClassyPrelude import ClassyPrelude
import System.Directory import System.Directory
import qualified Data.ByteString.Char8 as Char import qualified Data.ByteString.Char8 as Char
import System.IO.Unsafe import System.IO.Unsafe
import Diagrams.Prelude import Diagrams.Prelude
import Diagrams.Backend.Cairo import Diagrams.Backend.Cairo
import IHaskell.Display import IHaskell.Display
import IHaskell.Display.Diagrams.Animation import IHaskell.Display.Diagrams.Animation
instance IHaskellDisplay (QDiagram Cairo R2 Any) where instance IHaskellDisplay (QDiagram Cairo R2 Any) where
display renderable = do display renderable = do
...@@ -36,11 +37,13 @@ diagramData renderable format = do ...@@ -36,11 +37,13 @@ diagramData renderable format = do
-- Convert to base64. -- Convert to base64.
imgData <- readFile $ fpFromString filename imgData <- readFile $ fpFromString filename
let value = case format of let value =
PNG -> png (floor imgWidth) (floor imgHeight) $ base64 imgData case format of
SVG -> svg $ Char.unpack imgData PNG -> png (floor imgWidth) (floor imgHeight) $ base64 imgData
SVG -> svg $ Char.unpack imgData
return value return value
where where
extension SVG = "svg" extension SVG = "svg"
extension PNG = "png" extension PNG = "png"
......
{-# LANGUAGE NoImplicitPrelude, TypeSynonymInstances, FlexibleInstances #-} {-# LANGUAGE NoImplicitPrelude, TypeSynonymInstances, FlexibleInstances #-}
module IHaskell.Display.Diagrams.Animation (animation) where module IHaskell.Display.Diagrams.Animation (animation) where
import ClassyPrelude hiding (filename) import ClassyPrelude hiding (filename)
import Diagrams.Prelude import Diagrams.Prelude
import Diagrams.Backend.Cairo import Diagrams.Backend.Cairo
import Diagrams.Backend.Cairo.CmdLine (GifOpts (..)) import Diagrams.Backend.Cairo.CmdLine (GifOpts(..))
import Diagrams.Backend.CmdLine (DiagramOpts (..), mainRender) import Diagrams.Backend.CmdLine (DiagramOpts(..), mainRender)
import IHaskell.Display import IHaskell.Display
instance IHaskellDisplay (QAnimation Cairo R2 Any) where instance IHaskellDisplay (QAnimation Cairo R2 Any) where
display renderable = do display renderable = do
gif <- animationData renderable gif <- animationData renderable
return $ Display [html $ "<img src=\"data:image/gif;base64," return $ Display [html $ "<img src=\"data:image/gif;base64,"
++ gif ++ "\" />"] ++ gif ++ "\" />"]
animationData :: Animation Cairo R2 -> IO String animationData :: Animation Cairo R2 -> IO String
animationData renderable = do animationData renderable = do
...@@ -37,16 +38,12 @@ animationData renderable = do ...@@ -37,16 +38,12 @@ animationData renderable = do
-- Write the image. -- Write the image.
let filename = ".ihaskell-diagram.gif" let filename = ".ihaskell-diagram.gif"
diagOpts = DiagramOpts { diagOpts = DiagramOpts
_width = Just . ceiling $ imgWidth { _width = Just . ceiling $ imgWidth
, _height = Just . ceiling $ imgHeight , _height = Just . ceiling $ imgHeight
, _output = filename , _output = filename
} }
gifOpts = GifOpts { gifOpts = GifOpts { _dither = True, _noLooping = False, _loopRepeat = Nothing }
_dither = True
, _noLooping = False
, _loopRepeat = Nothing
}
mainRender (diagOpts, gifOpts) frameSet mainRender (diagOpts, gifOpts) frameSet
-- Convert to ascii represented base64 encoding -- Convert to ascii represented base64 encoding
......
{-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE FlexibleInstances #-}
-- | Provides 'IHaskellDisplay' instances for 'LaTeX' and 'LaTeXT'. -- | Provides 'IHaskellDisplay' instances for 'LaTeX' and 'LaTeXT'.
module IHaskell.Display.Hatex () where module IHaskell.Display.Hatex () where
import IHaskell.Display import IHaskell.Display
import Text.LaTeX import Text.LaTeX
import qualified Data.Text as T import qualified Data.Text as T
instance IHaskellDisplay LaTeX where instance IHaskellDisplay LaTeX where
display = display . IHaskell.Display.latex . T.unpack . render display = display . IHaskell.Display.latex . T.unpack . render
instance (a ~ (), IO ~ io) => IHaskellDisplay (LaTeXT io a) where instance (a ~ (), IO ~ io) => IHaskellDisplay (LaTeXT io a) where
display ma = display =<< execLaTeXT ma display ma = display =<< execLaTeXT ma
{-# LANGUAGE NoImplicitPrelude, TypeSynonymInstances, FlexibleInstances #-} {-# LANGUAGE NoImplicitPrelude, TypeSynonymInstances, FlexibleInstances #-}
module IHaskell.Display.Juicypixels
( module IHaskell.Display module IHaskell.Display.Juicypixels (module IHaskell.Display, module Codec.Picture) where
, module Codec.Picture
) where import Codec.Picture
import ClassyPrelude
import Codec.Picture import IHaskell.Display
import ClassyPrelude import System.Directory
import IHaskell.Display import System.IO.Unsafe
import System.Directory
import System.IO.Unsafe
-- instances -- instances
instance IHaskellDisplay DynamicImage where display = displayImageAsJpg instance IHaskellDisplay DynamicImage where
instance IHaskellDisplay (Image Pixel8) where display = displayImageAsJpg . ImageY8 display = displayImageAsJpg
instance IHaskellDisplay (Image Pixel16) where display = displayImageAsJpg . ImageY16
instance IHaskellDisplay (Image PixelF) where display = displayImageAsJpg . ImageYF instance IHaskellDisplay (Image Pixel8) where
instance IHaskellDisplay (Image PixelYA8) where display = displayImageAsJpg . ImageYA8 display = displayImageAsJpg . ImageY8
instance IHaskellDisplay (Image PixelYA16) where display = displayImageAsJpg . ImageYA16
instance IHaskellDisplay (Image PixelRGB8) where display = displayImageAsJpg . ImageRGB8 instance IHaskellDisplay (Image Pixel16) where
instance IHaskellDisplay (Image PixelRGB16) where display = displayImageAsJpg . ImageRGB16 display = displayImageAsJpg . ImageY16
instance IHaskellDisplay (Image PixelRGBF) where display = displayImageAsJpg . ImageRGBF
instance IHaskellDisplay (Image PixelRGBA8) where display = displayImageAsJpg . ImageRGBA8 instance IHaskellDisplay (Image PixelF) where
instance IHaskellDisplay (Image PixelRGBA16) where display = displayImageAsJpg . ImageRGBA16 display = displayImageAsJpg . ImageYF
instance IHaskellDisplay (Image PixelYCbCr8) where display = displayImageAsJpg . ImageYCbCr8
instance IHaskellDisplay (Image PixelCMYK8) where display = displayImageAsJpg . ImageCMYK8 instance IHaskellDisplay (Image PixelYA8) where
instance IHaskellDisplay (Image PixelCMYK16) where display = displayImageAsJpg . ImageCMYK16 display = displayImageAsJpg . ImageYA8
instance IHaskellDisplay (Image PixelYA16) where
display = displayImageAsJpg . ImageYA16
instance IHaskellDisplay (Image PixelRGB8) where
display = displayImageAsJpg . ImageRGB8
instance IHaskellDisplay (Image PixelRGB16) where
display = displayImageAsJpg . ImageRGB16
instance IHaskellDisplay (Image PixelRGBF) where
display = displayImageAsJpg . ImageRGBF
instance IHaskellDisplay (Image PixelRGBA8) where
display = displayImageAsJpg . ImageRGBA8
instance IHaskellDisplay (Image PixelRGBA16) where
display = displayImageAsJpg . ImageRGBA16
instance IHaskellDisplay (Image PixelYCbCr8) where
display = displayImageAsJpg . ImageYCbCr8
instance IHaskellDisplay (Image PixelCMYK8) where
display = displayImageAsJpg . ImageCMYK8
instance IHaskellDisplay (Image PixelCMYK16) where
display = displayImageAsJpg . ImageCMYK16
-- main rendering function -- main rendering function
displayImageAsJpg :: DynamicImage -> IO Display displayImageAsJpg :: DynamicImage -> IO Display
displayImageAsJpg renderable = do displayImageAsJpg renderable = do
switchToTmpDir switchToTmpDir
...@@ -40,30 +65,30 @@ displayImageAsJpg renderable = do ...@@ -40,30 +65,30 @@ displayImageAsJpg renderable = do
-- The type DynamicImage does not have a function to extract width and height -- The type DynamicImage does not have a function to extract width and height
imWidth :: DynamicImage -> Int imWidth :: DynamicImage -> Int
imWidth img = w imWidth img = w
where (w, h) = imWidthHeight img where
(w, h) = imWidthHeight img
imHeight :: DynamicImage -> Int imHeight :: DynamicImage -> Int
imHeight img = h imHeight img = h
where (w, h) = imWidthHeight img where
(w, h) = imWidthHeight img
-- Helper functions to pattern match on the DynamicImage Constructors -- Helper functions to pattern match on the DynamicImage Constructors
imWidthHeight :: DynamicImage -> (Int, Int) imWidthHeight :: DynamicImage -> (Int, Int)
imWidthHeight (ImageY8 im) = imWH im imWidthHeight (ImageY8 im) = imWH im
imWidthHeight (ImageY16 im) = imWH im imWidthHeight (ImageY16 im) = imWH im
imWidthHeight (ImageYF im) = imWH im imWidthHeight (ImageYF im) = imWH im
imWidthHeight (ImageYA8 im) = imWH im imWidthHeight (ImageYA8 im) = imWH im
imWidthHeight (ImageYA16 im) = imWH im imWidthHeight (ImageYA16 im) = imWH im
imWidthHeight (ImageRGB8 im) = imWH im imWidthHeight (ImageRGB8 im) = imWH im
imWidthHeight (ImageRGB16 im) = imWH im imWidthHeight (ImageRGB16 im) = imWH im
imWidthHeight (ImageRGBF im) = imWH im imWidthHeight (ImageRGBF im) = imWH im
imWidthHeight (ImageRGBA8 im) = imWH im imWidthHeight (ImageRGBA8 im) = imWH im
imWidthHeight (ImageRGBA16 im) = imWH im imWidthHeight (ImageRGBA16 im) = imWH im
imWidthHeight (ImageYCbCr8 im) = imWH im imWidthHeight (ImageYCbCr8 im) = imWH im
imWidthHeight (ImageCMYK8 im) = imWH im imWidthHeight (ImageCMYK8 im) = imWH im
imWidthHeight (ImageCMYK16 im) = imWH im imWidthHeight (ImageCMYK16 im) = imWH im
imWH :: (Image a) -> (Int, Int) imWH :: (Image a) -> (Int, Int)
imWH im = (imageWidth im, imageHeight im) imWH im = (imageWidth im, imageHeight im)
{-# LANGUAGE ViewPatterns, TypeSynonymInstances, FlexibleInstances #-} {-# LANGUAGE ViewPatterns, TypeSynonymInstances, FlexibleInstances #-}
module IHaskell.Display.Magic () where module IHaskell.Display.Magic () where
import IHaskell.Display import IHaskell.Display
import Magic import Magic
import qualified Data.ByteString as B import qualified Data.ByteString as B
import qualified Data.ByteString.Unsafe as B import qualified Data.ByteString.Unsafe as B
import qualified Data.ByteString.Base64 as Base64 import qualified Data.ByteString.Base64 as Base64
import qualified Data.ByteString.Char8 as Char import qualified Data.ByteString.Char8 as Char
import qualified Data.ByteString.UTF8 as B import qualified Data.ByteString.UTF8 as B
import Text.Read import Text.Read
import Data.Char import Data.Char
import qualified Data.Text as T import qualified Data.Text as T
import qualified Data.Text.Encoding as T import qualified Data.Text.Encoding as T
import IHaskell.IPython.Types (MimeType(MimeSvg)) import IHaskell.IPython.Types (MimeType(MimeSvg))
import Data.ByteString.UTF8 import Data.ByteString.UTF8
instance IHaskellDisplay T.Text where instance IHaskellDisplay T.Text where
display = display . T.encodeUtf8 display = display . T.encodeUtf8
instance IHaskellDisplay B.ByteString where instance IHaskellDisplay B.ByteString where
display x = do display x = do
m <- magicOpen [] m <- magicOpen []
magicLoadDefault m magicLoadDefault m
f <- B.unsafeUseAsCStringLen x (magicCString m) f <- B.unsafeUseAsCStringLen x (magicCString m)
return $ Display [withClass (parseMagic f) x] return $ Display [withClass (parseMagic f) x]
b64 :: B.ByteString -> String b64 :: B.ByteString -> String
b64 = Char.unpack . Base64.encode b64 = Char.unpack . Base64.encode
...@@ -34,7 +35,7 @@ withClass :: MagicClass -> B.ByteString -> DisplayData ...@@ -34,7 +35,7 @@ withClass :: MagicClass -> B.ByteString -> DisplayData
withClass SVG = DisplayData MimeSvg . T.decodeUtf8 withClass SVG = DisplayData MimeSvg . T.decodeUtf8
withClass (PNG w h) = png w h . T.decodeUtf8 . Base64.encode withClass (PNG w h) = png w h . T.decodeUtf8 . Base64.encode
withClass JPG = jpg 400 300 . T.decodeUtf8 . Base64.encode withClass JPG = jpg 400 300 . T.decodeUtf8 . Base64.encode
withClass HTML = html . B.toString withClass HTML = html . B.toString
withClass LaTeX = latex . B.toString withClass LaTeX = latex . B.toString
withClass _ = plain . B.toString withClass _ = plain . B.toString
...@@ -54,17 +55,20 @@ JPG ...@@ -54,17 +55,20 @@ JPG
-} -}
parseMagic :: String -> MagicClass parseMagic :: String -> MagicClass
parseMagic f = case words f of parseMagic f =
"SVG" : _ -> SVG case words f of
"PNG" : _image : _data : "SVG":_ -> SVG
(readMaybe -> Just w) : _x : "PNG":_image:_data:(readMaybe -> Just w):_x:(readMaybe . takeWhile isDigit -> Just h):_ -> PNG w
(readMaybe . takeWhile isDigit -> Just h) : _ -> PNG w h h
"LaTeX" : _ -> LaTeX "LaTeX":_ -> LaTeX
"HTML" : _ -> HTML "HTML":_ -> HTML
"JPEG" : _ -> JPG "JPEG":_ -> JPG
_ -> Unknown _ -> Unknown
data MagicClass = data MagicClass = SVG
SVG | PNG Int Int | JPG | HTML | LaTeX | Unknown | PNG Int Int
deriving Show | JPG
| HTML
| LaTeX
| Unknown
deriving Show
{-# LANGUAGE NoImplicitPrelude, TypeSynonymInstances, QuasiQuotes, FlexibleInstances, OverloadedStrings #-} {-# LANGUAGE NoImplicitPrelude, TypeSynonymInstances, QuasiQuotes, FlexibleInstances, OverloadedStrings #-}
module IHaskell.Display.Parsec () where module IHaskell.Display.Parsec () where
import ClassyPrelude hiding (fromList) import ClassyPrelude hiding (fromList)
import System.Random import System.Random
import Data.String.Here import Data.String.Here
import Data.HashMap.Strict as Map import Data.HashMap.Strict as Map
import Text.Parsec (parse, sourceLine, sourceColumn) import Text.Parsec (parse, sourceLine, sourceColumn)
import Text.Parsec.String (Parser) import Text.Parsec.String (Parser)
import Text.Parsec.Error (errorPos, ParseError) import Text.Parsec.Error (errorPos, ParseError)
import Data.Aeson import Data.Aeson
import IHaskell.Display import IHaskell.Display
instance Show a => IHaskellDisplay (Parser a) where instance Show a => IHaskellDisplay (Parser a) where
display renderable = return $ many [Display [javascript js], Display [html dom]] display renderable = return $ many [Display [javascript js], Display [html dom]]
where where
dom = [hereFile|widget.html|] dom = [hereFile|widget.html|]
js = [hereFile|widget.js|] js = [hereFile|widget.js|]
...@@ -25,25 +26,21 @@ data ParseText = ParseText String ...@@ -25,25 +26,21 @@ data ParseText = ParseText String
instance FromJSON ParseText where instance FromJSON ParseText where
parseJSON (Object v) = ParseText <$> v .: "text" parseJSON (Object v) = ParseText <$> v .: "text"
parseJSON _ = fail "Expecting object" parseJSON _ = fail "Expecting object"
-- | Output of parsing. -- | Output of parsing.
instance Show a => ToJSON (Either ParseError a) where instance Show a => ToJSON (Either ParseError a) where
toJSON (Left err) = object [ toJSON (Left err) = object
"status" .= ("error" :: String), [ "status" .= ("error" :: String)
"line" .= sourceLine (errorPos err), , "line" .= sourceLine (errorPos err)
"col" .= sourceColumn (errorPos err), , "col" .= sourceColumn (errorPos err)
"msg" .= show err , "msg" .= show err
] ]
toJSON (Right result) = object [ toJSON (Right result) = object ["status" .= ("success" :: String), "result" .= show result]
"status" .= ("success" :: String),
"result" .= show result
]
instance Show a => IHaskellWidget (Parser a) where instance Show a => IHaskellWidget (Parser a) where
-- Name for this widget. -- Name for this widget.
targetName _ = "parsec" targetName _ = "parsec"
-- When we rece -- When we rece
comm widget (Object dict) publisher = do comm widget (Object dict) publisher = do
let key = "text" :: Text let key = "text" :: Text
......
{-# OPTIONS_GHC -fno-warn-missing-fields #-} {-# OPTIONS_GHC -fno-warn-missing-fields #-}
{-# LANGUAGE TupleSections, TemplateHaskell #-} {-# LANGUAGE TupleSections, TemplateHaskell #-}
module IHaskell.Display.Rlangqq
( module RlangQQ, module IHaskell.Display.Rlangqq (
module RlangQQ,
rDisp, rDisp,
rDisplayAll, rDisplayAll,
rOutputParsed, rOutputParsed,
rOutput, rOutput,
getPlotNames, getPlotNames,
getCaptions, getCaptions,
) where ) where
import RlangQQ import RlangQQ
import RlangQQ.ParseKnitted import RlangQQ.ParseKnitted
import System.Directory import System.Directory
import System.FilePath import System.FilePath
import Data.Maybe import Data.Maybe
import Data.List import Data.List
import Text.Read import Text.Read
import qualified Data.ByteString as B import qualified Data.ByteString as B
import qualified Data.ByteString.Char8 as Char import qualified Data.ByteString.Char8 as Char
import qualified Data.ByteString.Base64 as Base64 import qualified Data.ByteString.Base64 as Base64
import IHaskell.Display import IHaskell.Display
import IHaskell.Display.Blaze () -- to confirm it's installed import IHaskell.Display.Blaze () -- to confirm it's installed
import qualified Text.Blaze.Html5 as H import qualified Text.Blaze.Html5 as H
import qualified Text.Blaze.Html5.Attributes as H import qualified Text.Blaze.Html5.Attributes as H
import Data.Monoid import Data.Char
import Data.Char import Control.Monad
import Control.Monad import Data.Ord
import Data.Ord import Data.List.Split
import Data.List.Split import Text.XFormat.Show hiding ((<>))
import Text.XFormat.Show hiding ((<>)) import Control.Applicative
import Control.Applicative import Control.Concurrent
import Control.Concurrent import Data.Monoid
import Data.Monoid import Data.Typeable
import Data.Typeable
import Control.Concurrent.STM import Control.Concurrent.STM
import Language.Haskell.TH.Quote import Language.Haskell.TH.Quote
-- | same as 'RlangQQ.r', but displays plots at the end too -- | same as 'RlangQQ.r', but displays plots at the end too
rDisp = QuasiQuoter { quoteExp = \s -> [| do rDisp = QuasiQuoter { quoteExp = \s -> [|do
result <- $(quoteExp r s) result <- $(quoteExp r s)
p <- rDisplayAll p <- rDisplayAll
printDisplay p printDisplay p
return result return result|] }
|] }
rOutput :: IO [Int] rOutput :: IO [Int]
rOutput = do rOutput = do
fs <- mapMaybe (readMaybe <=< stripPrefix "raw" <=< stripSuffix ".md") fs <- mapMaybe (readMaybe <=< stripPrefix "raw" <=< stripSuffix ".md")
<$> getDirectoryContents "Rtmp" <$> getDirectoryContents "Rtmp"
fs' <- forM fs $ \f -> (,f) <$> getModificationTime (showf ("Rtmp/raw"%Int%".md") f) fs' <- forM fs $ \f -> (,f) <$> getModificationTime (showf ("Rtmp/raw" % Int % ".md") f)
return $ map snd $ sortBy (flip (comparing fst)) fs' return $ map snd $ sortBy (flip (comparing fst)) fs'
-- | like 'stripPrefix' except on the end -- | like 'stripPrefix' except on the end
...@@ -62,35 +61,33 @@ rOutputParsed :: IO [KnitInteraction] ...@@ -62,35 +61,33 @@ rOutputParsed :: IO [KnitInteraction]
rOutputParsed = do rOutputParsed = do
ns <- rOutput ns <- rOutput
case ns of case ns of
[] -> return [] [] -> return []
n : _ -> parseKnitted <$> readFile (showf ("Rtmp/raw"%Int%".md") n) n:_ -> parseKnitted <$> readFile (showf ("Rtmp/raw" % Int % ".md") n)
getPlotNames :: IO [String] getPlotNames :: IO [String]
getPlotNames = do getPlotNames = do
interactions <- rOutputParsed interactions <- rOutputParsed
return [ p | KnitInteraction _ is <- interactions, KnitImage _ p <- is ] return [p | KnitInteraction _ is <- interactions
, KnitImage _ p <- is]
getCaptions :: IO [String] getCaptions :: IO [String]
getCaptions = do getCaptions = do
interactions <- rOutputParsed interactions <- rOutputParsed
return [ c | KnitInteraction _ is <- interactions, return
KnitImage c _ <- is, [c | KnitInteraction _ is <- interactions
not (isBoringCaption c) ] , KnitImage c _ <- is
, not (isBoringCaption c)]
-- | true when the caption name looks like one knitr will automatically -- | true when the caption name looks like one knitr will automatically generate
-- generate
isBoringCaption :: String -> Bool isBoringCaption :: String -> Bool
isBoringCaption s = maybe False isBoringCaption s = maybe False (all isDigit) (stripPrefix "plot of chunk unnamed-chunk-" s)
(all isDigit)
(stripPrefix "plot of chunk unnamed-chunk-" s)
rDisplayAll :: IO Display rDisplayAll :: IO Display
rDisplayAll = do rDisplayAll = do
ns <- rOutputParsed ns <- rOutputParsed
imgs <- sequence [ displayInteraction o | KnitInteraction _ os <- ns, o <- os] imgs <- sequence [displayInteraction o | KnitInteraction _ os <- ns
display (mconcat imgs) , o <- os]
display (mconcat imgs)
displayInteraction :: KnitOutput -> IO Display displayInteraction :: KnitOutput -> IO Display
displayInteraction (KnitPrint c) = display (plain c) displayInteraction (KnitPrint c) = display (plain c)
...@@ -99,10 +96,11 @@ displayInteraction (KnitError c) = display (plain c) ...@@ -99,10 +96,11 @@ displayInteraction (KnitError c) = display (plain c)
displayInteraction (KnitAsIs c) = display (plain c) displayInteraction (KnitAsIs c) = display (plain c)
displayInteraction (KnitImage cap img) = do displayInteraction (KnitImage cap img) = do
let caption let caption
| isBoringCaption cap = mempty | isBoringCaption cap = mempty
| otherwise = H.p (H.toMarkup cap) | otherwise = H.p (H.toMarkup cap)
encoded <- Base64.encode <$> B.readFile img encoded <- Base64.encode <$> B.readFile img
display $ H.img H.! H.src (H.unsafeByteStringValue display $ H.img H.! H.src
-- assumes you use the default device which is png (H.unsafeByteStringValue
(Char.pack "data:image/png;base64," <> encoded)) -- assumes you use the default device which is png
<> caption (Char.pack "data:image/png;base64," <> encoded))
<> caption
...@@ -23,10 +23,7 @@ getUniqueName = do ...@@ -23,10 +23,7 @@ getUniqueName = do
putMVar uniqueCounter val' putMVar uniqueCounter val'
return $ pack $ "ihaskellStaticCanvasUniqueID" ++ show val return $ pack $ "ihaskellStaticCanvasUniqueID" ++ show val
data Canvas = Canvas { width :: Int data Canvas = Canvas { width :: Int, height :: Int, canvas :: CanvasFree () }
, height :: Int
, canvas :: CanvasFree ()
}
instance IHaskellDisplay Canvas where instance IHaskellDisplay Canvas where
display cnv = do display cnv = do
......
{-# LANGUAGE NoImplicitPrelude, OverloadedStrings #-} {-# LANGUAGE NoImplicitPrelude, OverloadedStrings #-}
module IHaskell.Display.Widgets () where module IHaskell.Display.Widgets () where
import ClassyPrelude import ClassyPrelude
import Data.Aeson import Data.Aeson
import IHaskell.Widgets import IHaskell.Widgets
import IHaskell.Display import IHaskell.Display
data WidgetName = ButtonWidget data WidgetName = ButtonWidget
...@@ -17,18 +18,19 @@ instance ToJSON WidgetName where ...@@ -17,18 +18,19 @@ instance ToJSON WidgetName where
toJSON ButtonWidget = "ButtonView" toJSON ButtonWidget = "ButtonView"
instance ToJSON WidgetMessage where instance ToJSON WidgetMessage where
toJSON DisplayWidget = object [ "method" .= str "display" ] toJSON DisplayWidget = object ["method" .= str "display"]
toJSON (InitialState name) = object [ toJSON (InitialState name) = object
"method" .= str "update", [ "method" .= str "update"
"state" .= object [ , "state" .= object
"_view_name" .= name, [ "_view_name" .= name
"visible" .= True, , "visible" .= True
"_css" .= object [], , "_css" .= object []
"msg_throttle" .= (3 :: Int), , "msg_throttle" .= (3 :: Int)
"disabled" .= False, , "disabled" .= False
"description" .= str "Button" , "description" .= str "Button"
] ]
] ]
str :: String -> String str :: String -> String
str = id str = id
...@@ -40,12 +42,11 @@ data ParseText = ParseText String ...@@ -40,12 +42,11 @@ data ParseText = ParseText String
instance FromJSON ParseText where instance FromJSON ParseText where
parseJSON (Object v) = ParseText <$> v .: "text" parseJSON (Object v) = ParseText <$> v .: "text"
parseJSON _ = fail "Expecting object" parseJSON _ = fail "Expecting object"
instance IHaskellWidget Slider where instance IHaskellWidget Slider where
-- Name for this widget. -- Name for this widget.
targetName _ = "WidgetModel" targetName _ = "WidgetModel"
-- Start by sending messages to set up the widget. -- Start by sending messages to set up the widget.
open widget send = do open widget send = do
putStrLn "Sending widgets!" putStrLn "Sending widgets!"
......
module IHaskell.Widgets ( module IHaskell.Widgets (Slider(..)) where
Slider(..)
) where
data Slider = Slider data Slider = Slider
This diff is collapsed.
-- | This module exports all the types and functions necessary to create an -- | This module exports all the types and functions necessary to create an IPython language kernel
-- IPython language kernel that supports the @ipython console@ and @ipython -- that supports the @ipython console@ and @ipython notebook@ frontends.
-- notebook@ frontends. module IHaskell.IPython.Kernel (module X) where
module IHaskell.IPython.Kernel (
module X,
) where
import IHaskell.IPython.Types as X import IHaskell.IPython.Types as X
import IHaskell.IPython.Message.Writer as X import IHaskell.IPython.Message.Writer as X
import IHaskell.IPython.Message.Parser as X import IHaskell.IPython.Message.Parser as X
import IHaskell.IPython.Message.UUID as X import IHaskell.IPython.Message.UUID as X
import IHaskell.IPython.ZeroMQ as X import IHaskell.IPython.ZeroMQ as X
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
-- | Description : Parsing messages received from IPython -- | Description : Parsing messages received from IPython
-- --
-- This module is responsible for converting from low-level ByteStrings -- This module is responsible for converting from low-level ByteStrings obtained from the 0MQ
-- obtained from the 0MQ sockets into Messages. The only exposed function is -- sockets into Messages. The only exposed function is `parseMessage`, which should only be used in
-- `parseMessage`, which should only be used in the low-level 0MQ interface. -- the low-level 0MQ interface.
module IHaskell.IPython.Message.Parser (parseMessage) where module IHaskell.IPython.Message.Parser (parseMessage) where
import Data.Aeson ((.:), decode, Result(..), Object) import Data.Aeson ((.:), decode, Result(..), Object)
...@@ -17,9 +18,7 @@ import IHaskell.IPython.Types ...@@ -17,9 +18,7 @@ import IHaskell.IPython.Types
type LByteString = Lazy.ByteString type LByteString = Lazy.ByteString
----- External interface ----- -- --- External interface ----- | Parse a message from its ByteString components into a Message.
-- | Parse a message from its ByteString components into a Message.
parseMessage :: [ByteString] -- ^ The list of identifiers sent with the message. parseMessage :: [ByteString] -- ^ The list of identifiers sent with the message.
-> ByteString -- ^ The header data. -> ByteString -- ^ The header data.
-> ByteString -- ^ The parent header, which is just "{}" if there is no header. -> ByteString -- ^ The parent header, which is just "{}" if there is no header.
...@@ -32,26 +31,25 @@ parseMessage idents headerData parentHeader metadata content = ...@@ -32,26 +31,25 @@ parseMessage idents headerData parentHeader metadata content =
messageWithoutHeader = parser messageType $ Lazy.fromStrict content messageWithoutHeader = parser messageType $ Lazy.fromStrict content
in messageWithoutHeader { header = header } in messageWithoutHeader { header = header }
----- Module internals ----- -- --- Module internals ----- | Parse a header from its ByteString components into a MessageHeader.
-- | Parse a header from its ByteString components into a MessageHeader.
parseHeader :: [ByteString] -- ^ The list of identifiers. parseHeader :: [ByteString] -- ^ The list of identifiers.
-> ByteString -- ^ The header data. -> ByteString -- ^ The header data.
-> ByteString -- ^ The parent header, or "{}" for Nothing. -> ByteString -- ^ The parent header, or "{}" for Nothing.
-> ByteString -- ^ The metadata, or "{}" for an empty map. -> ByteString -- ^ The metadata, or "{}" for an empty map.
-> MessageHeader -- The resulting message header. -> MessageHeader -- The resulting message header.
parseHeader idents headerData parentHeader metadata = parseHeader idents headerData parentHeader metadata =
MessageHeader { identifiers = idents MessageHeader
, parentHeader = parentResult { identifiers = idents
, metadata = metadataMap , parentHeader = parentResult
, messageId = messageUUID , metadata = metadataMap
, sessionId = sessionUUID , messageId = messageUUID
, username = username , sessionId = sessionUUID
, msgType = messageType , username = username
} , msgType = messageType
}
where where
-- Decode the header data and the parent header data into JSON objects. -- Decode the header data and the parent header data into JSON objects. If the parent header data is
-- If the parent header data is absent, just have Nothing instead. -- absent, just have Nothing instead.
Just result = decode $ Lazy.fromStrict headerData :: Maybe Object Just result = decode $ Lazy.fromStrict headerData :: Maybe Object
parentResult = if parentHeader == "{}" parentResult = if parentHeader == "{}"
then Nothing then Nothing
...@@ -71,27 +69,26 @@ noHeader :: MessageHeader ...@@ -71,27 +69,26 @@ noHeader :: MessageHeader
noHeader = error "No header created" noHeader = error "No header created"
parser :: MessageType -- ^ The message type being parsed. parser :: MessageType -- ^ The message type being parsed.
-> LByteString -> Message -- ^ The parser that converts the body into a message. -> LByteString -> Message -- ^ The parser that converts the body into a message. This message
-- This message should have an undefined header. -- should have an undefined header.
parser KernelInfoRequestMessage = kernelInfoRequestParser parser KernelInfoRequestMessage = kernelInfoRequestParser
parser ExecuteRequestMessage = executeRequestParser parser ExecuteRequestMessage = executeRequestParser
parser CompleteRequestMessage = completeRequestParser parser CompleteRequestMessage = completeRequestParser
parser ObjectInfoRequestMessage = objectInfoRequestParser parser ObjectInfoRequestMessage = objectInfoRequestParser
parser ShutdownRequestMessage = shutdownRequestParser parser ShutdownRequestMessage = shutdownRequestParser
parser InputReplyMessage = inputReplyParser parser InputReplyMessage = inputReplyParser
parser CommOpenMessage = commOpenParser parser CommOpenMessage = commOpenParser
parser CommDataMessage = commDataParser parser CommDataMessage = commDataParser
parser CommCloseMessage = commCloseParser parser CommCloseMessage = commCloseParser
parser HistoryRequestMessage = historyRequestParser parser HistoryRequestMessage = historyRequestParser
parser other = error $ "Unknown message type " ++ show other parser other = error $ "Unknown message type " ++ show other
-- | Parse a kernel info request. -- | Parse a kernel info request. A kernel info request has no auxiliary information, so ignore the
-- A kernel info request has no auxiliary information, so ignore the body. -- body.
kernelInfoRequestParser :: LByteString -> Message kernelInfoRequestParser :: LByteString -> Message
kernelInfoRequestParser _ = KernelInfoRequest { header = noHeader } kernelInfoRequestParser _ = KernelInfoRequest { header = noHeader }
-- | Parse an execute request. -- | Parse an execute request. Fields used are:
-- Fields used are:
-- 1. "code": the code to execute. -- 1. "code": the code to execute.
-- 2. "silent": whether to execute silently. -- 2. "silent": whether to execute silently.
-- 3. "store_history": whether to include this in history. -- 3. "store_history": whether to include this in history.
...@@ -99,22 +96,23 @@ kernelInfoRequestParser _ = KernelInfoRequest { header = noHeader } ...@@ -99,22 +96,23 @@ kernelInfoRequestParser _ = KernelInfoRequest { header = noHeader }
executeRequestParser :: LByteString -> Message executeRequestParser :: LByteString -> Message
executeRequestParser content = executeRequestParser content =
let parser obj = do let parser obj = do
code <- obj .: "code" code <- obj .: "code"
silent <- obj .: "silent" silent <- obj .: "silent"
storeHistory <- obj .: "store_history" storeHistory <- obj .: "store_history"
allowStdin <- obj .: "allow_stdin" allowStdin <- obj .: "allow_stdin"
return (code, silent, storeHistory, allowStdin) return (code, silent, storeHistory, allowStdin)
Just decoded = decode content Just decoded = decode content
Success (code, silent, storeHistory, allowStdin) = parse parser decoded Success (code, silent, storeHistory, allowStdin) = parse parser decoded
in ExecuteRequest { header = noHeader in ExecuteRequest
, getCode = code { header = noHeader
, getSilent = silent , getCode = code
, getAllowStdin = allowStdin , getSilent = silent
, getStoreHistory = storeHistory , getAllowStdin = allowStdin
, getUserVariables = [] , getStoreHistory = storeHistory
, getUserExpressions = [] , getUserVariables = []
} , getUserExpressions = []
}
requestParser parser content = parsed requestParser parser content = parsed
where where
...@@ -147,7 +145,6 @@ objectInfoRequestParser = requestParser $ \obj -> do ...@@ -147,7 +145,6 @@ objectInfoRequestParser = requestParser $ \obj -> do
dlevel <- obj .: "detail_level" dlevel <- obj .: "detail_level"
return $ ObjectInfoRequest noHeader oname dlevel return $ ObjectInfoRequest noHeader oname dlevel
shutdownRequestParser :: LByteString -> Message shutdownRequestParser :: LByteString -> Message
shutdownRequestParser = requestParser $ \obj -> do shutdownRequestParser = requestParser $ \obj -> do
code <- obj .: "restart" code <- obj .: "restart"
......
-- | Description : UUID generator and data structure -- | Description : UUID generator and data structure
-- --
-- Generate, parse, and pretty print UUIDs for use with IPython. -- Generate, parse, and pretty print UUIDs for use with IPython.
module IHaskell.IPython.Message.UUID ( module IHaskell.IPython.Message.UUID (UUID, random, randoms) where
UUID,
random, randoms,
) where
import Control.Monad (mzero, replicateM) import Control.Monad (mzero, replicateM)
import Control.Applicative ((<$>)) import Control.Applicative ((<$>))
import Data.Text (pack) import Data.Text (pack)
import Data.Aeson import Data.Aeson
import Data.UUID.V4 (nextRandom) import Data.UUID.V4 (nextRandom)
-- We use an internal string representation because for the purposes of
-- IPython, it matters whether the letters are uppercase or lowercase and
-- whether the dashes are present in the correct locations. For the
-- purposes of new UUIDs, it does not matter, but IPython expects UUIDs
-- passed to kernels to be returned unchanged, so we cannot actually parse
-- them.
-- | A UUID (universally unique identifier). -- | A UUID (universally unique identifier).
data UUID = UUID String deriving (Show, Read, Eq, Ord) data UUID =
-- We use an internal string representation because for the purposes of IPython, it
-- matters whether the letters are uppercase or lowercase and whether the dashes are
-- present in the correct locations. For the purposes of new UUIDs, it does not matter,
-- but IPython expects UUIDs passed to kernels to be returned unchanged, so we cannot
-- actually parse them.
UUID String
deriving (Show, Read, Eq, Ord)
-- | Generate a list of random UUIDs. -- | Generate a list of random UUIDs.
randoms :: Int -- ^ Number of UUIDs to generate. randoms :: Int -- ^ Number of UUIDs to generate.
......
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
-- | Description : @ToJSON@ for Messages -- | Description : @ToJSON@ for Messages
-- --
-- This module contains the @ToJSON@ instance for @Message@. -- This module contains the @ToJSON@ instance for @Message@.
module IHaskell.IPython.Message.Writer ( module IHaskell.IPython.Message.Writer (ToJSON(..)) where
ToJSON(..)
) where
import Data.Aeson import Data.Aeson
import Data.Map (Map) import Data.Map (Map)
import Data.Text (Text, pack) import Data.Text (Text, pack)
import Data.Monoid (mempty) import Data.Monoid (mempty)
import qualified Data.ByteString.Lazy as L import qualified Data.ByteString.Lazy as L
import qualified Data.ByteString as B import qualified Data.ByteString as B
import Data.Text.Encoding import Data.Text.Encoding
import IHaskell.IPython.Types import IHaskell.IPython.Types
-- Convert message bodies into JSON. -- Convert message bodies into JSON.
instance ToJSON Message where instance ToJSON Message where
toJSON KernelInfoReply{ versionList = vers, language = language } = object [ toJSON KernelInfoReply { versionList = vers, language = language } =
"protocol_version" .= string "5.0", -- current protocol version, major and minor object ["protocol_version" .= string "5.0" -- current protocol version, major and minor
"language_version" .= vers, , "language_version" .= vers, "language" .= language]
"language" .= language
] toJSON ExecuteReply { status = status, executionCounter = counter, pagerOutput = pager } =
object
toJSON ExecuteReply{ status = status, executionCounter = counter, pagerOutput = pager} = object [ [ "status" .= show status
"status" .= show status, , "execution_count" .= counter
"execution_count" .= counter, , "payload" .=
"payload" .= if null pager
if null pager then []
then [] else [object ["source" .= string "page", "text" .= pager]]
else [object [ , "user_variables" .= emptyMap
"source" .= string "page", , "user_expressions" .= emptyMap
"text" .= pager ]
]], toJSON PublishStatus { executionState = executionState } =
"user_variables" .= emptyMap, object ["execution_state" .= executionState]
"user_expressions" .= emptyMap toJSON PublishStream { streamType = streamType, streamContent = content } =
] object ["data" .= content, "name" .= streamType]
toJSON PublishStatus{ executionState = executionState } = object [ toJSON PublishDisplayData { source = src, displayData = datas } =
"execution_state" .= executionState object
] ["source" .= src, "metadata" .=
toJSON PublishStream{ streamType = streamType, streamContent = content } = object [ object [], "data" .=
"data" .= content, object (map displayDataToJson datas)]
"name" .= streamType
] toJSON PublishOutput { executionCount = execCount, reprText = reprText } =
toJSON PublishDisplayData{ source = src, displayData = datas } = object [ object
"source" .= src, ["data" .=
"metadata" .= object [], object ["text/plain" .= reprText], "execution_count" .= execCount, "metadata" .=
"data" .= object (map displayDataToJson datas) object []]
] toJSON PublishInput { executionCount = execCount, inCode = code } =
object ["execution_count" .= execCount, "code" .= code]
toJSON PublishOutput{ executionCount = execCount, reprText = reprText } = object [ toJSON (CompleteReply _ matches start end metadata status) =
"data" .= object ["text/plain" .= reprText], object
"execution_count" .= execCount, [ "matches" .= matches
"metadata" .= object [] , "cursor_start" .= start
] , "cursor_end" .= end
toJSON PublishInput{ executionCount = execCount, inCode = code } = object [ , "metadata" .= metadata
"execution_count" .= execCount, , "status" .= if status
"code" .= code then string "ok"
] else "error"
toJSON (CompleteReply _ matches start end metadata status) = object [ ]
"matches" .= matches, toJSON o@ObjectInfoReply{} =
"cursor_start" .= start, object
"cursor_end" .= end, [ "oname" .=
"metadata" .= metadata, objectName o
"status" .= if status then string "ok" else "error" , "found" .= objectFound o
] , "ismagic" .= False
toJSON o@ObjectInfoReply{} = object [ , "isalias" .= False
"oname" .= objectName o, , "type_name" .= objectTypeString o
"found" .= objectFound o, , "docstring" .= objectDocString o
"ismagic" .= False, ]
"isalias" .= False,
"type_name" .= objectTypeString o, toJSON ShutdownReply { restartPending = restart } =
"docstring" .= objectDocString o object ["restart" .= restart]
]
toJSON ClearOutput { wait = wait } =
toJSON ShutdownReply{restartPending = restart} = object [ object ["wait" .= wait]
"restart" .= restart
] toJSON RequestInput { inputPrompt = prompt } =
object ["prompt" .= prompt]
toJSON ClearOutput{wait = wait} = object [
"wait" .= wait toJSON req@CommOpen{} =
] object ["comm_id" .= commUuid req, "target_name" .= commTargetName req, "data" .= commData req]
toJSON RequestInput{inputPrompt = prompt} = object [ toJSON req@CommData{} =
"prompt" .= prompt object ["comm_id" .= commUuid req, "data" .= commData req]
]
toJSON req@CommClose{} =
toJSON req@CommOpen{} = object [ object ["comm_id" .= commUuid req, "data" .= commData req]
"comm_id" .= commUuid req,
"target_name" .= commTargetName req, toJSON req@HistoryReply{} =
"data" .= commData req object ["history" .= map tuplify (historyReply req)]
] where
tuplify (HistoryReplyElement sess linum res) = (sess, linum, case res of
toJSON req@CommData{} = object [ Left inp -> toJSON inp
"comm_id" .= commUuid req, Right (inp, out) -> toJSON out)
"data" .= commData req
]
toJSON req@CommClose{} = object [
"comm_id" .= commUuid req,
"data" .= commData req
]
toJSON req@HistoryReply{} = object [ "history" .= map tuplify (historyReply req) ]
where tuplify (HistoryReplyElement sess linum res) = (sess, linum, case res of
Left inp -> toJSON inp
Right (inp, out) -> toJSON out)
toJSON body = error $ "Do not know how to convert to JSON for message " ++ show body toJSON body = error $ "Do not know how to convert to JSON for message " ++ show body
-- | Print an execution state as "busy", "idle", or "starting". -- | Print an execution state as "busy", "idle", or "starting".
instance ToJSON ExecutionState where instance ToJSON ExecutionState where
toJSON Busy = String "busy" toJSON Busy = String "busy"
toJSON Idle = String "idle" toJSON Idle = String "idle"
toJSON Starting = String "starting" toJSON Starting = String "starting"
-- | Print a stream as "stdin" or "stdout" strings. -- | Print a stream as "stdin" or "stdout" strings.
instance ToJSON StreamType where instance ToJSON StreamType where
toJSON Stdin = String "stdin" toJSON Stdin = String "stdin"
toJSON Stdout = String "stdout" toJSON Stdout = String "stdout"
-- | Convert a MIME type and value into a JSON dictionary pair. -- | Convert a MIME type and value into a JSON dictionary pair.
displayDataToJson :: DisplayData -> (Text, Value) displayDataToJson :: DisplayData -> (Text, Value)
displayDataToJson (DisplayData mimeType dataStr) = displayDataToJson (DisplayData mimeType dataStr) =
pack (show mimeType) .= String dataStr pack (show mimeType) .= String dataStr
----- Constants ----- ----- Constants -----
emptyMap :: Map String String emptyMap :: Map String String
emptyMap = mempty emptyMap = mempty
......
{-# LANGUAGE OverloadedStrings, DoAndIfThenElse #-} {-# LANGUAGE OverloadedStrings, DoAndIfThenElse #-}
-- | This module provides a way in which the Haskell standard input may be
-- forwarded to the IPython frontend and thus allows the notebook to use -- | This module provides a way in which the Haskell standard input may be forwarded to the IPython
-- the standard input. -- frontend and thus allows the notebook to use the standard input.
-- --
-- This relies on the implementation of file handles in GHC, and is -- This relies on the implementation of file handles in GHC, and is generally unsafe and terrible.
-- generally unsafe and terrible. However, it is difficult to find another -- However, it is difficult to find another way to do it, as file handles are generally meant to
-- way to do it, as file handles are generally meant to point to streams -- point to streams and files, and not networked communication protocols.
-- and files, and not networked communication protocols.
-- --
-- In order to use this module, it must first be initialized with two -- In order to use this module, it must first be initialized with two things. First of all, in order
-- things. First of all, in order to know how to communicate with the -- to know how to communicate with the IPython frontend, it must know the kernel profile used for
-- IPython frontend, it must know the kernel profile used for -- communication. For this, use @recordKernelProfile@ once the profile is known. Both this and
-- communication. For this, use @recordKernelProfile@ once the profile is -- @recordParentHeader@ take a directory name where they can store this data.
-- known. Both this and @recordParentHeader@ take a directory name where
-- they can store this data.
-- --
-- Finally, the module must know what @execute_request@ message is -- Finally, the module must know what @execute_request@ message is currently being replied to (which
-- currently being replied to (which will request the input). Thus, every -- will request the input). Thus, every time the language kernel receives an @execute_request@
-- time the language kernel receives an @execute_request@ message, it -- message, it should inform this module via @recordParentHeader@, so that the module may generate
-- should inform this module via @recordParentHeader@, so that the module -- messages with an appropriate parent header set. If this is not done, the IPython frontends will
-- may generate messages with an appropriate parent header set. If this is -- not recognize the target of the communication.
-- not done, the IPython frontends will not recognize the target of the
-- communication.
-- --
-- Finally, in order to activate this module, @fixStdin@ must be called -- Finally, in order to activate this module, @fixStdin@ must be called once. It must be passed the
-- once. It must be passed the same directory name as @recordParentHeader@ -- same directory name as @recordParentHeader@ and @recordKernelProfile@. Note that if this is being
-- and @recordKernelProfile@. Note that if this is being used from within -- used from within the GHC API, @fixStdin@ /must/ be called from within the GHC session not from
-- the GHC API, @fixStdin@ /must/ be called from within the GHC session -- the host code.
-- not from the host code. module IHaskell.IPython.Stdin (fixStdin, recordParentHeader, recordKernelProfile) where
module IHaskell.IPython.Stdin (
fixStdin,
recordParentHeader,
recordKernelProfile
) where
import Control.Concurrent import Control.Concurrent
import Control.Applicative ((<$>)) import Control.Applicative ((<$>))
import Control.Concurrent.Chan import Control.Concurrent.Chan
import Control.Monad import Control.Monad
import GHC.IO.Handle import GHC.IO.Handle
import GHC.IO.Handle.Types import GHC.IO.Handle.Types
import System.IO import System.IO
import System.Posix.IO import System.Posix.IO
import System.IO.Unsafe import System.IO.Unsafe
import qualified Data.Map as Map import qualified Data.Map as Map
import IHaskell.IPython.Types import IHaskell.IPython.Types
import IHaskell.IPython.ZeroMQ import IHaskell.IPython.ZeroMQ
import IHaskell.IPython.Message.UUID as UUID import IHaskell.IPython.Message.UUID as UUID
stdinInterface :: MVar ZeroMQStdin stdinInterface :: MVar ZeroMQStdin
{-# NOINLINE stdinInterface #-} {-# NOINLINE stdinInterface #-}
stdinInterface = unsafePerformIO newEmptyMVar stdinInterface = unsafePerformIO newEmptyMVar
-- | Manipulate standard input so that it is sourced from the IPython -- | Manipulate standard input so that it is sourced from the IPython frontend. This function is
-- frontend. This function is build on layers of deep magical hackery, so -- build on layers of deep magical hackery, so be careful modifying it.
-- be careful modifying it.
fixStdin :: String -> IO () fixStdin :: String -> IO ()
fixStdin dir = do fixStdin dir = do
-- Initialize the stdin interface. -- Initialize the stdin interface.
...@@ -78,17 +67,18 @@ stdinOnce dir = do ...@@ -78,17 +67,18 @@ stdinOnce dir = do
hDuplicateTo newStdin stdin hDuplicateTo newStdin stdin
loop stdinInput oldStdin newStdin loop stdinInput oldStdin newStdin
where where
loop stdinInput oldStdin newStdin = do loop stdinInput oldStdin newStdin = do
let FileHandle _ mvar = stdin let FileHandle _ mvar = stdin
threadDelay $ 150 * 1000 threadDelay $ 150 * 1000
empty <- isEmptyMVar mvar empty <- isEmptyMVar mvar
if not empty if not empty
then loop stdinInput oldStdin newStdin then loop stdinInput oldStdin newStdin
else do else do
line <- getInputLine dir line <- getInputLine dir
hPutStr stdinInput $ line ++ "\n" hPutStr stdinInput $ line ++ "\n"
loop stdinInput oldStdin newStdin loop stdinInput oldStdin newStdin
-- | Get a line of input from the IPython frontend. -- | Get a line of input from the IPython frontend.
getInputLine :: String -> IO String getInputLine :: String -> IO String
...@@ -98,15 +88,15 @@ getInputLine dir = do ...@@ -98,15 +88,15 @@ getInputLine dir = do
-- Send a request for input. -- Send a request for input.
uuid <- UUID.random uuid <- UUID.random
parentHeader <- read <$> readFile (dir ++ "/.last-req-header") parentHeader <- read <$> readFile (dir ++ "/.last-req-header")
let header = MessageHeader { let header = MessageHeader
username = username parentHeader, { username = username parentHeader
identifiers = identifiers parentHeader, , identifiers = identifiers parentHeader
parentHeader = Just parentHeader, , parentHeader = Just parentHeader
messageId = uuid, , messageId = uuid
sessionId = sessionId parentHeader, , sessionId = sessionId parentHeader
metadata = Map.fromList [], , metadata = Map.fromList []
msgType = InputRequestMessage , msgType = InputRequestMessage
} }
let msg = RequestInput header "" let msg = RequestInput header ""
writeChan req msg writeChan req msg
......
...@@ -44,10 +44,16 @@ except: ...@@ -44,10 +44,16 @@ except:
# Find all the source files # Find all the source files
sources = [] sources = []
for root, dirnames, filenames in os.walk("src"): for source_dir in ["src", "ipython-kernel", "ihaskell-display"]:
for filename in filenames: for root, dirnames, filenames in os.walk(source_dir):
if filename.endswith(".hs"): # Skip cabal dist directories
sources.append(os.path.join(root, filename)) if "dist" in root:
continue
for filename in filenames:
# Take Haskell files, but ignore the Cabal Setup.hs
if filename.endswith(".hs") and filename != "Setup.hs":
sources.append(os.path.join(root, filename))
hindent_outputs = {} hindent_outputs = {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment