Fix Hasura metadata generation (#411)

Author: droserasprout

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [unreleased]
+
+### Fixed
+
+* hasura: Fixed metadata generation.
+
 ## [5.2.1] - 2022-07-02
 
 ### Fixed

src/demo_hic_et_nunc/graphql/token.graphql

@@ -109,7 +109,6 @@ def __init__(
 
     async def configure(self, force: bool = False) -> None:
         """Generate Hasura metadata and apply to instance with credentials from `hasura` config section."""
-
         # TODO: Validate during config parsing
         if self._database_config.schema_name != DEFAULT_POSTGRES_SCHEMA:
             raise ConfigurationError('Hasura integration requires `schema_name` to be `public`')
@@ -141,8 +140,8 @@ async def configure(self, force: bool = False) -> None:
         source['tables'] = await self._generate_source_tables_metadata()
 
         # NOTE: Don't forget to invalidate old queries, customization will fail otherwise.
-        source['query_collections'] = []
-        source['rest_endpoints'] = []
+        metadata['query_collections'] = []
+        metadata['rest_endpoints'] = []
 
         await self._replace_metadata(metadata)
 
@@ -155,7 +154,7 @@ async def configure(self, force: bool = False) -> None:
         # NOTE: Generate and apply queries and REST endpoints
         query_collections_metadata = await self._generate_query_collections_metadata()
         self._logger.info('Adding %s generated and user-defined queries', len(query_collections_metadata))
-        source['query_collections'] = [
+        metadata['query_collections'] = [
             {
                 "name": "allowed-queries",
                 "definition": {"queries": query_collections_metadata},
@@ -166,7 +165,7 @@ async def configure(self, force: bool = False) -> None:
             self._logger.info('Adding %s REST endpoints', len(query_collections_metadata))
             query_names = [q['name'] for q in query_collections_metadata]
             rest_endpoints_metadata = await self._generate_rest_endpoints_metadata(query_names)
-            source['rest_endpoints'] = rest_endpoints_metadata
+            metadata['rest_endpoints'] = rest_endpoints_metadata
 
         await self._replace_metadata(metadata)
 
@@ -267,7 +266,6 @@ async def _replace_metadata(self, metadata: Dict[str, Any]) -> None:
             'type': 'replace_metadata',
             'args': {
                 'metadata': metadata,
-                'allow_inconsistent_metadata': True,
             },
         }
         await self._hasura_request(endpoint, json)
@@ -617,10 +615,5 @@ def _format_select_permissions(self) -> Dict[str, Any]:
 
     def _get_relation_source_field(self, field: RelationalFieldT) -> str:
         if source_field := field.source_field:
-            name = field.model._meta.fields_db_projection[source_field]
-        else:
-            name = field.model_field_name + '_id'
-
-        if self._hasura_config.camel_case:
-            return humps.camelize(name)
-        return name
+            return field.model._meta.fields_db_projection[source_field]
+        return field.model_field_name + '_id'

src/dipdup/hasura.py

@@ -70,11 +70,9 @@ async def test_configure_hasura(self) -> None:
             await stack.enter_async_context(hasura_gateway)
 
             try:
-                await hasura_gateway.configure()
+                await hasura_gateway.configure(force=True)
 
                 config.hasura.camel_case = True
-                hasura_gateway = HasuraGateway('demo_hic_et_nunc', config.hasura, config.database)
-                await stack.enter_async_context(hasura_gateway)
 
                 await hasura_gateway.configure(force=True)
             except HasuraError: