[REFACT] Move annotations, graph and moissonneurs modules in gargantext dir

annotations/urls.py → gargantext/annotations/urls.py

 from django.conf.urls import url
-from annotations import views
+from gargantext.annotations import views
 
 
 # /!\ urls patterns here are *without* the trailing slash

graph/distances.py → gargantext/graph/distances.py

-from gargantext.models     import Node, NodeNgram, NodeNgramNgram, \
-                                  NodeHyperdata
-from gargantext.util.db    import session, aliased
-
-from graph.louvain         import best_partition
+import math
+import numpy    as np
+import pandas   as pd
+import networkx as nx
 
 from copy        import copy
 from collections import defaultdict
 from math        import log,sqrt
 #from operator import itemgetter
 
-import math
-import numpy    as np
-import pandas   as pd
-import networkx as nx
+from gargantext.models     import Node, NodeNgram, NodeNgramNgram, \
+                                  NodeHyperdata
+from gargantext.util.db    import session, aliased
+
+from .louvain import best_partition
+
 
 def clusterByDistances( cooc_matrix
                , field1=None, field2=None

graph/graph.py → gargantext/graph/graph.py

-# Gargantext lib
-from gargantext.util.db           import session, aliased
-from gargantext.util.lists        import WeightedMatrix, UnweightedList, Translations
-from gargantext.util.http         import JsonHttpResponse
-from gargantext.models            import Node, Ngram, NodeNgram, NodeNgramNgram, NodeHyperdata
+from celery                     import shared_task
+from datetime                   import datetime
 
-from graph.cooccurrences          import countCooccurrences
-from graph.distances              import clusterByDistances
-from graph.bridgeness             import filterByBridgeness
-from graph.mail_notification      import notify_owner
-from graph.growth                 import compute_growth
+from gargantext.util.db         import session, aliased
+from gargantext.util.lists      import WeightedMatrix, UnweightedList, Translations
+from gargantext.util.http       import JsonHttpResponse
+from gargantext.models          import Node, Ngram, NodeNgram, NodeNgramNgram, NodeHyperdata
 
-from gargantext.util.scheduling   import scheduled
-from gargantext.constants         import graph_constraints
+from gargantext.util.scheduling import scheduled
+from gargantext.constants       import graph_constraints
 
-from celery                       import shared_task
-from datetime                     import datetime
+from .cooccurrences             import countCooccurrences
+from .distances                 import clusterByDistances
+from .bridgeness                import filterByBridgeness
+from .mail_notification         import notify_owner
+from .growth                    import compute_growth
 
 
 @shared_task
@@ -65,7 +64,7 @@ def compute_graph( corpus_id=None      , cooc_id=None
 
         print("GRAPH #%d ... Filtering by bridgeness %d." % (cooc_id, bridgeness))
         data = filterByBridgeness(G,partition,ids,weight,bridgeness,"node_link",field1,field2)
-        
+
         if start is not None and end is not None:
             growth= dict()
             for (ng_id, score) in compute_growth(corpus_id, groupList_id, mapList_id, start, end):
@@ -73,7 +72,7 @@ def compute_graph( corpus_id=None      , cooc_id=None
 
             for node in data['nodes']:
                 node['attributes']['growth'] = growth[node['id']]
-        
+
         print("GRAPH #%d ... Saving Graph in hyperdata as json." % cooc_id)
         node = session.query(Node).filter(Node.id == cooc_id).first()
 
@@ -271,5 +270,5 @@ def get_graph( request=None         , corpus=None
     if len(data) == 0:
         print("GRAPH #   ... GET_GRAPH: 0 coocs in matrix")
         data = {'nodes':[], 'links':[]}  # empty data
-    
+
     return data

graph/rest.py → gargantext/graph/rest.py

+from traceback               import format_tb
+
 from gargantext.util.db      import session
 from gargantext.models.nodes import Node
-from graph.graph             import get_graph
-from graph.utils             import compress_graph, format_html
-from gargantext.util.http    import APIView, APIException\
-                                  , JsonHttpResponse, requires_auth
-
+from gargantext.util.http    import APIView, APIException, \
+                                    JsonHttpResponse, requires_auth
 from gargantext.constants    import graph_constraints
-from traceback               import format_tb
+
+from .graph  import get_graph
+from .utils  import compress_graph, format_html
+
 
 class Graph(APIView):
     '''

graph/urls.py → gargantext/graph/urls.py

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

moissonneurs/istex.py → gargantext/moissonneurs/istex.py

@@ -15,7 +15,7 @@ from gargantext.util.http       import JsonHttpResponse
 from gargantext.util.scheduling import scheduled
 from gargantext.util.toolchain  import parse_extract_indexhyperdata
 
-from moissonneurs.util              import Scraper
+from .util                      import Scraper
 RESOURCE_TYPE_ISTEX = 8
 
 

moissonneurs/pubmed.py → gargantext/moissonneurs/pubmed.py

@@ -26,7 +26,7 @@ from gargantext.util.http       import JsonHttpResponse
 from gargantext.util.scheduling import scheduled
 from gargantext.util.toolchain  import parse_extract_indexhyperdata
 
-from moissonneurs.util              import Scraper
+from .util                      import Scraper
 
 
 

moissonneurs/urls.py → gargantext/moissonneurs/urls.py

@@ -13,12 +13,12 @@
 from django.conf.urls import url
 
 # Available databases :
-import moissonneurs.pubmed   as pubmed
-import moissonneurs.istex    as istex
-import moissonneurs.cern     as cern
-import moissonneurs.multivac as multivac
-import moissonneurs.hal      as hal
-import moissonneurs.isidore  as isidore
+import gargantext.moissonneurs.pubmed   as pubmed
+import gargantext.moissonneurs.istex    as istex
+import gargantext.moissonneurs.cern     as cern
+import gargantext.moissonneurs.multivac as multivac
+import gargantext.moissonneurs.hal      as hal
+import gargantext.moissonneurs.isidore  as isidore
 
 # TODO : ISIDORE
 
@@ -28,17 +28,17 @@ urlpatterns = [ url(r'^pubmed/query$'       , pubmed.query   )
 
               , url(r'^istex/query$'        , istex.query    )
               , url(r'^istex/save/(\d+)'    , istex.save     )
-              
+
               , url(r'^cern/query$'         , cern.query     )
               , url(r'^cern/save/(\d+)'     , cern.save      )
-              
+
               , url(r'^multivac/query$'     , multivac.query )
               , url(r'^multivac/save/(\d+)' , multivac.save  )
 
               , url(r'^hal/query$'          , hal.query      )
               , url(r'^hal/save/(\d+)'      , hal.save       )
 
-             , url(r'^isidore/query$'      , isidore.query   )
-             , url(r'^isidore/save/(\d+)'  , isidore.save    )
-              
+              , url(r'^isidore/query$'      , isidore.query  )
+              , url(r'^isidore/save/(\d+)'  , isidore.save   )
+
               ]

gargantext/settings.py

@@ -43,9 +43,9 @@ CELERYBEAT_SCHEDULER = 'djcelery.schedulers.DatabaseScheduler'
 CELERY_IMPORTS = (
                     "gargantext.util.toolchain",
                     "gargantext.util.crawlers",
-                    "graph.graph",
-                    "moissonneurs.pubmed",
-                    "moissonneurs.istex",
+                    "gargantext.graph.graph",
+                    "gargantext.moissonneurs.pubmed",
+                    "gargantext.moissonneurs.istex",
                     "gargantext.util.ngramlists_tools",
                     )
 
@@ -64,9 +64,9 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'rest_framework',
     'djcelery',
-    'annotations',
-    'graph',
-    'moissonneurs',
+    'gargantext.annotations',
+    'gargantext.graph',
+    'gargantext.moissonneurs',
     'gargantext',
 ]
 

gargantext/urls.py

@@ -18,14 +18,14 @@ import gargantext.views.pages.urls
 
 # Module Annotation
     ## tempo: unchanged doc-annotations --
-from annotations         import urls as annotations_urls
-from annotations.views   import main as annotations_main_view
+from gargantext.annotations         import urls as annotations_urls
+from gargantext.annotations.views   import main as annotations_main_view
 
 # Module for graph service
-import graph.urls
+import gargantext.graph.urls
 
 # Module Scrapers
-import moissonneurs.urls
+import gargantext.moissonneurs.urls
 
 
 urlpatterns = [ url(r'^admin/'     , admin.site.urls                                   )
@@ -35,7 +35,7 @@ urlpatterns = [ url(r'^admin/'     , admin.site.urls
                                     , permanent=False), name="favicon"                 )
 
               # Module Graph
-              , url(r'^'           , include( graph.urls )                             )
+              , url(r'^'           , include( gargantext.graph.urls )                  )
 
               # Module Annotation
               # tempo: unchanged doc-annotations routes --
@@ -44,5 +44,5 @@ urlpatterns = [ url(r'^admin/'     , admin.site.urls
                                                                 , annotations_main_view)
 
               # Module Scrapers (Moissonneurs in French)
-              , url(r'^moissonneurs/'   , include( moissonneurs.urls )                 )
+              , url(r'^moissonneurs/'   , include( gargantext.moissonneurs.urls )      )
               ]

gargantext/views/api/urls.py

@@ -10,7 +10,7 @@ from . import ngrams
 from . import metrics
 from . import ngramlists
 from . import analytics
-from graph.rest import Graph
+from gargantext.graph.rest import Graph
 
 urlpatterns = [ url(r'^nodes$'                , nodes.NodeListResource.as_view())
               , url(r'^nodes/(\d+)$'          , nodes.NodeResource.as_view())

install/notebook/gargantext_notebook.py

@@ -147,7 +147,7 @@ def get_moissonneur(name):
     if not isinstance(name, str) or not name.islower():
         raise NotebookError("Invalid moissonneur name: %r" % name)
 
-    module = importlib.import_module('moissonneurs.%s' % name)
+    module = importlib.import_module('gargantext.moissonneurs.%s' % name)
     module.name = name
 
     return module