Rename our server-side "graphExplorer" app to "graph", in order to prevent...

Rename our server-side "graphExplorer" app to "graph", in order to prevent confusion with client-side tina-based graphExplorer from static/lib

gargantext/settings.py

@@ -54,7 +54,7 @@ INSTALLED_APPS = [
     'rest_framework',
     'djcelery',
     'annotations',
-    'graphExplorer',
+    'graph',
     'moissonneurs',
 ]
 
@@ -164,6 +164,3 @@ USE_I18N = True
 USE_L10N = True
 
 USE_TZ = True
-
-
-

gargantext/urls.py

@@ -21,9 +21,8 @@ import gargantext.views.pages.urls
 from annotations         import urls as annotations_urls
 from annotations.views   import main as annotations_main_view
 
-# Module "Graph Explorer"
-#from graphExplorer     import urls as graphExplorer_urls
-import graphExplorer.urls
+# Module for graph service
+import graph.urls
 
 # Module Scrapers
 import moissonneurs.urls
@@ -35,8 +34,8 @@ urlpatterns = [ url(r'^admin/'     , admin.site.urls                           )
               , url(r'^favicon.ico$', Redirect.as_view( url=static.url('favicon.ico')
                                     , permanent=False), name="favicon")
 
-              # Module "Graph Explorer"
-              , url(r'^'           , include( graphExplorer.urls )             )
+              # Module Graph
+              , url(r'^'           , include( graph.urls )                     )
 
               # Module Annotation
               # tempo: unchanged doc-annotations routes --

gargantext/views/api/urls.py

@@ -4,7 +4,7 @@ from . import nodes
 from . import metrics
 from . import ngramlists
 from . import analytics
-from graphExplorer.rest import Graph
+from graph.rest import Graph
 
 urlpatterns = [ url(r'^nodes$'                , nodes.NodeListResource.as_view()     )
               , url(r'^nodes/(\d+)$'          , nodes.NodeResource.as_view()         )
@@ -59,11 +59,11 @@ urlpatterns = [ url(r'^nodes$'                , nodes.NodeListResource.as_view()
 
               , url(r'^ngramlists/maplist$'     , ngramlists.MapListGlance.as_view() )
                 # fast access to maplist, similarly formatted for termtable
-              
+
               , url(r'^projects/(\d+)/corpora/(\d+)/explorer$'      , Graph.as_view())
                 # data for graph explorer (json)
                 #                 GET /api/projects/43198/corpora/111107/explorer?
                 # Corresponding view is : /projects/43198/corpora/111107/explorer?
-                # Parameters (example): 
+                # Parameters (example):
                 # explorer?field1=ngrams&field2=ngrams&distance=conditional&bridgeness=5&start=1996-6-1&end=2002-10-5
               ]

graphExplorer/distances.py → graph/distances.py

@@ -2,7 +2,7 @@ from gargantext.models     import Node, NodeNgram, NodeNgramNgram, \
                                   NodeHyperdata
 from gargantext.util.db    import session, aliased
 
-from graphExplorer.louvain import best_partition
+from graph.louvain         import best_partition
 
 from copy        import copy
 from collections import defaultdict

graphExplorer/graph.py → graph/graph.py

@@ -5,9 +5,9 @@ from gargantext.util.http         import JsonHttpResponse
 from gargantext.models            import Node, Ngram, NodeNgram, NodeNgramNgram
 
 #from gargantext.util.toolchain.ngram_coocs import compute_coocs
-from graphExplorer.cooccurrences  import countCooccurrences, filterMatrix
-from graphExplorer.distances      import clusterByDistances
-from graphExplorer.bridgeness     import filterByBridgeness
+from graph.cooccurrences  import countCooccurrences, filterMatrix
+from graph.distances      import clusterByDistances
+from graph.bridgeness     import filterByBridgeness
 
 # Prelude lib
 from copy                         import copy, deepcopy

graphExplorer/rest.py → graph/rest.py

@@ -2,7 +2,7 @@
 
 from gargantext.util.db      import session
 from gargantext.models.nodes import Node
-from graphExplorer.graph     import get_graph
+from graph.graph             import get_graph
 from gargantext.util.http    import APIView, APIException\
                                   , JsonHttpResponse, requires_auth
 

graphExplorer/urls.py → graph/urls.py

 from django.conf.urls import patterns, url
 
 # Module "Graph Explorer"
-from graphExplorer.rest         import Graph
-from graphExplorer.views        import explorer, myGraphs
-from graphExplorer.intersection import intersection
+from graph.rest         import Graph
+from graph.views        import explorer, myGraphs
+from graph.intersection import intersection
 
 
 # TODO : factor urls