girder 3.2.13.dev4__tar.gz → 3.2.13.dev8__tar.gz

{girder-3.2.13.dev4/girder.egg-info → girder-3.2.13.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder
-Version: 3.2.13.dev4
+Version: 3.2.13.dev8
 Summary: Web-based data management platform
 Home-page: https://girder.readthedocs.org
 Author: Kitware, Inc.

{girder-3.2.13.dev4 → girder-3.2.13.dev8}/girder/api/describe.py

@@ -97,6 +97,8 @@ class Description:
             self._responses['200'] = {
                 'description': 'Success'
             }
+        if not any(str(k).startswith('4') for k in self._responses):
+            self.errorResponse()
         if self._responseClass is not None:
             schema = {
                 '$ref': '#/definitions/%s' % self._responseClass
@@ -250,6 +252,14 @@ class Description:
         if default is not None:
             param['default'] = default
 
+        for p in self._params:
+            if p['name'] == param['name'] and p['in'] == param['in']:
+                if p.get('default') != param.get('default') or p.get('enum') != param.get('enum'):
+                    logprint.warning('parameter %r similar but different from %r', param, p)
+                p['required'] = p['required'] and param['required']
+                if param['description'] not in p['description']:
+                    p['description'] += '\n\n' + param['description']
+                return self
         self._params.append(param)
         return self
 
@@ -420,7 +430,8 @@ class Description:
             reason = '\n\n'.join(reason)
 
         if code in self._responses:
-            self._responses[code]['description'] += '\n\n' + reason
+            if reason not in self._responses[code]['description']:
+                self._responses[code]['description'] += '\n\n' + reason
         else:
             self._responses[code] = {
                 'description': reason
@@ -525,7 +536,8 @@ class Describe(Resource):
 
             # Tag Object
             tags.append({
-                'name': tag
+                'name': tag,
+                'description': f'{tag} resource',
             })
 
             for route, methods in docs.routes[resource].items():
@@ -558,7 +570,11 @@ class Describe(Resource):
             'swagger': SWAGGER_VERSION,
             'info': {
                 'title': 'Girder REST API',
-                'version': VERSION['release']
+                'version': VERSION['release'],
+                'license': {
+                    'name': 'Apache-2.0',
+                    'url': 'https://www.apache.org/licenses/LICENSE-2.0.txt',
+                },
             },
             'host': host,
             'basePath': basePath,

{girder-3.2.13.dev4 → girder-3.2.13.dev8}/girder/models/model_base.py

@@ -197,13 +197,26 @@ class Model(metaclass=_ModelSingleton):
 
     def _createIndex(self, index):
         if isinstance(index, (list, tuple)):
+            keys, opts = index[0], index[1]
+            if isinstance(keys, str):
+                keys = [(keys, pymongo.ASCENDING)]
+            if 'background' not in opts:
+                opts = opts.copy()
+                opts['background'] = True
             try:
-                self.collection.create_index(index[0], **index[1])
-            except pymongo.errors.OperationFailure:
-                self.collection.drop_index(index[0])
-                self.collection.create_index(index[0], **index[1])
+                self.collection.create_index(keys, **opts)
+            except pymongo.errors.OperationFailure as e:
+                code_name = e.details.get('codeName') if hasattr(e, 'details') else None
+                if code_name in ('IndexOptionsConflict', 'IndexKeySpecsConflict'):
+                    for idx in self.collection.list_indexes():
+                        if list(idx['key'].items()) == keys:
+                            self.collection.drop_index(idx['name'])
+                            break
+                    self.collection.create_index(keys, **opts)
+                else:
+                    raise
         else:
-            self.collection.create_index(index)
+            self.collection.create_index(index, background=True)
 
     def ensureTextIndex(self, index, language='english'):
         """

{girder-3.2.13.dev4 → girder-3.2.13.dev8/girder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder
-Version: 3.2.13.dev4
+Version: 3.2.13.dev8
 Summary: Web-based data management platform
 Home-page: https://girder.readthedocs.org
 Author: Kitware, Inc.