fixes #14 Session open/save methods are implememted.

cytoscape · Jul 14, 2016 · 4914588 · 4914588
1 parent 3f06798
commit 4914588
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 23 deletions.
diff --git a/examples/1_Intro.ipynb b/examples/1_Intro.ipynb
@@ -2,77 +2,96 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
    "metadata": {
     "collapsed": false
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Python 3.5.2 :: Anaconda 4.1.1 (x86_64)\r\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "!python --version"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 1,
    "metadata": {
-    "collapsed": true
+    "collapsed": false
    },
    "outputs": [],
    "source": [
     "import py2cytoscape\n",
     "from py2cytoscape.data.cyrest_client import CyRestClient\n",
     "\n",
-    "cy = CyRestClient(ip='127.0.0.1', port=8080)\n",
+    "cy = CyRestClient(ip='127.0.0.1', port=1234)\n",
     "\n",
     "# 現在のセッションのクリア\n",
     "cy.session.delete()"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": null,
+   "metadata": {
+    "collapsed": true
+   },
+   "outputs": [],
+   "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
    "metadata": {
     "collapsed": true
    },
    "outputs": [],
    "source": [
     "import networkx as nx\n",
+    "import igraph as ig\n",
+    "\n",
     "g = nx.scale_free_graph(500)\n",
     "deg = nx.degree(g)\n",
     "btw = nx.betweenness_centrality(g)\n",
     "\n",
     "nx.set_node_attributes(g, 'degree', deg)\n",
-    "nx.set_node_attributes(g, 'betweenness', btw)"
+    "nx.set_node_attributes(g, 'betweenness', btw)\n",
+    "\n",
+    "g2 = ig.Graph.GRG(100, 0.2)"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": null,
    "metadata": {
     "collapsed": true
    },
    "outputs": [],
    "source": [
-    "g_cy = cy.network.create_from_networkx(g)"
+    "g_cy = cy.network.create_from_networkx(g)\n",
+    "g2_cy = cy.network.create_from_igraph(g2)"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": null,
    "metadata": {
     "collapsed": true
    },
    "outputs": [],
    "source": [
-    "cy.layout.apply(name='kamada-kawai', network=g_cy)"
+    "cy.layout.apply(name='kamada-kawai', network=g_cy)\n",
+    "cy.layout.apply(name='kamada-kawai', network=g2_cy)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [],
+   "source": [
+    "# Save the session\n",
+    "cy.session.save(file_name='/Users/kono/test34.cys')"
    ]
   }
  ],

diff --git a/py2cytoscape/data/session_client.py b/py2cytoscape/data/session_client.py
@@ -1,6 +1,6 @@
-
 import requests
 
+
 class SessionClient(object):
 
     def __init__(self, url):
@@ -10,7 +10,19 @@ def delete(self):
         requests.delete(self.__url)
 
     def save(self, file_name=None):
-        pass
+        if file_name is None:
+            raise ValueError('Session file name is required.')
+
+        post_url = self.__url
+        params = {'file': file_name}
+        res = requests.post(post_url, params=params)
+        return res
+
+    def open(self, file_name=None):
+        if file_name is None:
+            raise ValueError('Session file name is required.')
 
-    def load(self, file_name=None):
-        pass
+        get_url = self.__url
+        params = {'file': file_name}
+        res = requests.get(get_url, params=params)
+        return res